Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions sqladvisor/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -317,9 +317,18 @@ uint get_join_table_result_set(TABLE_LIST *table) {
int num_fields = mysql_num_fields(result);

MYSQL_ROW row;


int mysql_server_version = mysql_get_server_version(con);
if (options.verbose){
sql_print_information("mysql_server_version: %d\n",mysql_server_version);
}
if ((row = mysql_fetch_row(result))) {
result_set_count = atoi(row[EXPLAIN_ROWS]);
if (mysql_server_version >= 50700){
result_set_count = atoi(row[9]);
}
else{
result_set_count = atoi(row[EXPLAIN_ROWS]);
}
}
g_string_free(cardinality_sql, TRUE);
mysql_free_result(result);
Expand Down