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

MDEV-11231 Server crashes in check_duplicate_key on CREATE TABLE ... SELECT

Browse Source 
be consistent and don't include the table name into the error message,
no other CREATE TABLE error does it.

(the crash happened, because thd->lex->query_tables was NULL)
This commit is contained in:
Sergei Golubchik
2016-12-02 14:34:45 +01:00
parent c5ef621599
commit 7f2fd34500
36 changed files with 286 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_table.cc
View File

@@ -3120,8 +3120,7 @@ void promote_first_timestamp_column(List<Create_field> *column_definitions)
@param key_info Key meta-data info.
@param key_list List of existing keys.
*/
static void check_duplicate_key(THD *thd,
Key *key, KEY *key_info,
static void check_duplicate_key(THD *thd, Key *key, KEY *key_info,
List<Key> *key_list)
{
/*
@@ -3183,14 +3182,11 @@ static void check_duplicate_key(THD *thd,
// Report a warning if we have two identical keys.
DBUG_ASSERT(thd->lex->query_tables->alias);
if (all_columns_are_identical)
{
push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE,
ER_DUP_INDEX, ER(ER_DUP_INDEX),
key_info->name,
thd->lex->query_tables->db,
thd->lex->query_tables->alias);
key_info->name);
break;
}
}