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

MDEV-7926 Server crashes in get_geometry_column_record on concurrent SELECT FROM I_S.GEOMETRY_COLUMNS with join and DDL.

Browse Source 
The bug was that open_tables() returned error in case of
        thd->killed() without properly calling thd->send_kill_message()
        to set the correct error. This was fixed already in get_schema_column_record,
        so the code was just copied to get_geometry_column_record.
This commit is contained in:
Alexey Botchkov
2015-05-12 15:09:28 +05:00
parent 58e8db2eb3
commit 8c54182ec4
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/sql_show.cc
View File

@@ -373,6 +373,23 @@ static int get_geometry_column_record(THD *thd, TABLE_LIST *tables,
Field **ptr, *field; Field **ptr, *field;
DBUG_ENTER("get_geometry_column_record"); DBUG_ENTER("get_geometry_column_record");
if (res)
{
if (thd->lex->sql_command != SQLCOM_SHOW_FIELDS)
{
/*
I.e. we are in SELECT FROM INFORMATION_SCHEMA.COLUMS
rather than in SHOW COLUMNS
*/
push_warning(thd, Sql_condition::WARN_LEVEL_WARN,
thd->get_stmt_da()->sql_errno(),
thd->get_stmt_da()->message());
thd->clear_error();
res= 0;
}
DBUG_RETURN(res);
}
if (tables->schema_table) if (tables->schema_table)
goto exit; goto exit;
show_table= tables->table; show_table= tables->table;