mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 07:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.3 into 10.4

Browse source
This commit is contained in:
Marko Mäkelä 2020-10-22 13:27:18 +03:00
commit 46957a6a77
144 changed files with 2473 additions and 605 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sql/sql_show.cc
View file

@ -5313,6 +5313,11 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond)
free_root(&tmp_mem_root, MY_MARK_BLOCKS_FREE);
}
}
if (thd->killed == ABORT_QUERY)
{
error= 0;
goto err;
}
}
}
}