1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-8358 ALTER TABLE .. ADD PRIMARY KEY IF NOT EXISTS -> ERROR 1068 (42000): Multiple primary key defined

Browse Source 
Checks for multiple primary keys added.
This commit is contained in:
Alexey Botchkov 2015-10-25 22:45:48 +04:00
parent 2c0bcfff8c
commit c9185225cb
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/r/alter_table.result
View File

@ -2012,3 +2012,12 @@ t1 CREATE TABLE `t1` (
UNIQUE KEY `idx` (`i`) UNIQUE KEY `idx` (`i`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 (
`event_id` bigint(20) unsigned NOT NULL DEFAULT '0',
`market_id` bigint(20) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`event_id`,`market_id`)
);
ALTER TABLE t1 ADD PRIMARY KEY IF NOT EXISTS event_id (event_id,market_id);
Warnings:
Note 1061 Multiple primary key defined
DROP TABLE t1;

13
mysql-test/t/alter_table.test
View File

@ -1699,3 +1699,16 @@ alter table t1 add unique index if not exists idx(i);
alter table t1 add unique index if not exists idx(i); alter table t1 add unique index if not exists idx(i);
show create table t1; show create table t1;
DROP TABLE t1; DROP TABLE t1;
#
# MDEV-8358 ADD PRIMARY KEY IF NOT EXISTS -> ERROR 1068 (42000): Multiple primary key
#
CREATE TABLE t1 (
`event_id` bigint(20) unsigned NOT NULL DEFAULT '0',
`market_id` bigint(20) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`event_id`,`market_id`)
);
ALTER TABLE t1 ADD PRIMARY KEY IF NOT EXISTS event_id (event_id,market_id);
DROP TABLE t1;

11
sql/sql_table.cc
View File

@ -5846,6 +5846,16 @@ drop_create_field:
{ {
if (!key->create_if_not_exists) if (!key->create_if_not_exists)
continue; continue;
/* Check if the table already has a PRIMARY KEY */
if (key->type == Key::PRIMARY &&
table->s->primary_key != MAX_KEY)
{
push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE,
ER_DUP_KEYNAME, ER(ER_MULTIPLE_PRI_KEY));
goto remove_key_no_warn;
}
/* If the name of the key is not specified, */ /* If the name of the key is not specified, */
/* let us check the name of the first key part. */ /* let us check the name of the first key part. */
if ((keyname= key->name.str) == NULL) if ((keyname= key->name.str) == NULL)
@ -5912,6 +5922,7 @@ drop_create_field:
remove_key: remove_key:
push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE, push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE,
ER_DUP_KEYNAME, ER(ER_DUP_KEYNAME), keyname); ER_DUP_KEYNAME, ER(ER_DUP_KEYNAME), keyname);
remove_key_no_warn:
key_it.remove(); key_it.remove();
if (key->type == Key::FOREIGN_KEY) if (key->type == Key::FOREIGN_KEY)
{ {