database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

A preparatory patch for MDEV-7284 INDEX: CREATE OR REPLACE.

Browse Source 
Removing "bool Key::create_if_not_exists" and deriving Key from
DDL_options instead.
This commit is contained in:
Alexander Barkov
2015-03-20 13:51:41 +04:00
parent 2a2cc16478
commit 0c26c0032c
6 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_table.cc
View File

@ -5830,7 +5830,7 @@ drop_create_field:
const char *keyname;
while ((key=key_it++))
{
if (!key->create_if_not_exists)
if (!key->if_not_exists())
continue;
/* If the name of the key is not specified, */
/* let us check the name of the first key part. */
@ -7627,7 +7627,7 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
key= new Key(key_type, key_name, strlen(key_name),
&key_create_info,
MY_TEST(key_info->flags & HA_GENERATED_KEY),
key_parts, key_info->option_list, FALSE);
key_parts, key_info->option_list, DDL_options());
new_key_list.push_back(key);
}
}