database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

correct fix for the old Bug#39955 (warnings in I_S.VARIABLES)

Browse Source 
old fix only generated a warning for the *first* row
in the output
This commit is contained in:
Sergei Golubchik
2014-08-28 09:33:00 +02:00
parent d281faf992
commit 9bd5d54c11
3 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_show.cc
View File

@@ -3111,7 +3111,6 @@ static bool show_status_array(THD *thd, const char *wild,
break;
}
table->field[1]->store(pos, (uint32) (end - pos), charset);
thd->count_cuted_fields= CHECK_FIELD_IGNORE;
table->field[1]->set_notnull();
mysql_mutex_unlock(&LOCK_global_system_variables);
@@ -3121,6 +3120,7 @@ static bool show_status_array(THD *thd, const char *wild,
res= TRUE;
goto end;
}
thd->get_stmt_da()->inc_current_row_for_warning();
}
}
}