database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Sergei Golubchik
2018-03-28 17:06:27 +02:00
parent c346029958 aafb9d44d6
commit b1818dccf7
344 changed files with 8784 additions and 6890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_show.cc
View File

@ -3836,6 +3836,13 @@ extern ST_SCHEMA_TABLE schema_tables[];
bool schema_table_store_record(THD *thd, TABLE *table)
{
int error;
if (thd->killed)
{
thd->send_kill_message();
return 1;
}
if ((error= table->file->ha_write_tmp_row(table->record[0])))
{
TMP_TABLE_PARAM *param= table->pos_in_table_list->schema_table_param;