database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Applying InnoDB snashot 5.1-ss6129

Browse Source 
Detailed revision comments:

r6122 | jyang | 2009-10-30 05:18:38 +0200 (Fri, 30 Oct 2009) | 7 lines
branches/5.1: Chnage WARN_LEVEL_ERROR to WARN_LEVEL_WARN
for push_warning_printf() call in innodb.
Fix Bug#47233: Innodb calls push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR)

rb://170 approved by Marko.
This commit is contained in:
Sergey Vojtovich
2009-11-02 18:59:44 +04:00
parent 8663ff17fb
commit 842c568d2a
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/innodb_bug44369.result
View File

@ -2,13 +2,13 @@ create table bug44369 (DB_ROW_ID int) engine=innodb;
ERROR HY000: Can't create table 'test.bug44369' (errno: -1) ERROR HY000: Can't create table 'test.bug44369' (errno: -1)
create table bug44369 (db_row_id int) engine=innodb; create table bug44369 (db_row_id int) engine=innodb;
ERROR HY000: Can't create table 'test.bug44369' (errno: -1) ERROR HY000: Can't create table 'test.bug44369' (errno: -1)
show errors; show warnings;
Level Code Message Level Code Message
Error 1005 Error creating table 'test/bug44369' with column name 'db_row_id'. 'db_row_id' is a reserved name. Please try to re-create the table with a different column name. Warning 1005 Error creating table 'test/bug44369' with column name 'db_row_id'. 'db_row_id' is a reserved name. Please try to re-create the table with a different column name.
Error 1005 Can't create table 'test.bug44369' (errno: -1) Error 1005 Can't create table 'test.bug44369' (errno: -1)
create table bug44369 (db_TRX_Id int) engine=innodb; create table bug44369 (db_TRX_Id int) engine=innodb;
ERROR HY000: Can't create table 'test.bug44369' (errno: -1) ERROR HY000: Can't create table 'test.bug44369' (errno: -1)
show errors; show warnings;
Level Code Message Level Code Message
Error 1005 Error creating table 'test/bug44369' with column name 'db_TRX_Id'. 'db_TRX_Id' is a reserved name. Please try to re-create the table with a different column name. Warning 1005 Error creating table 'test/bug44369' with column name 'db_TRX_Id'. 'db_TRX_Id' is a reserved name. Please try to re-create the table with a different column name.
Error 1005 Can't create table 'test.bug44369' (errno: -1) Error 1005 Can't create table 'test.bug44369' (errno: -1)

8
mysql-test/r/innodb_bug46000.result
View File

@ -2,16 +2,16 @@ create table bug46000(`id` int,key `GEN_CLUST_INDEX`(`id`))engine=innodb;
ERROR HY000: Can't create table 'test.bug46000' (errno: -1) ERROR HY000: Can't create table 'test.bug46000' (errno: -1)
create table bug46000(`id` int, key `GEN_clust_INDEX`(`id`))engine=innodb; create table bug46000(`id` int, key `GEN_clust_INDEX`(`id`))engine=innodb;
ERROR HY000: Can't create table 'test.bug46000' (errno: -1) ERROR HY000: Can't create table 'test.bug46000' (errno: -1)
show errors; show warnings;
Level Code Message Level Code Message
Error 1005 Cannot Create Index with name 'GEN_CLUST_INDEX'. The name is reserved for the system default primary index. Warning 1005 Cannot Create Index with name 'GEN_CLUST_INDEX'. The name is reserved for the system default primary index.
Error 1005 Can't create table 'test.bug46000' (errno: -1) Error 1005 Can't create table 'test.bug46000' (errno: -1)
create table bug46000(id int) engine=innodb; create table bug46000(id int) engine=innodb;
create index GEN_CLUST_INDEX on bug46000(id); create index GEN_CLUST_INDEX on bug46000(id);
ERROR HY000: Can't create table '#sql-temporary' (errno: -1) ERROR HY000: Can't create table '#sql-temporary' (errno: -1)
show errors; show warnings;
Level Code Message Level Code Message
Error 1005 Cannot Create Index with name 'GEN_CLUST_INDEX'. The name is reserved for the system default primary index. Warning 1005 Cannot Create Index with name 'GEN_CLUST_INDEX'. The name is reserved for the system default primary index.
Error 1005 Can't create table '#sql-temporary' (errno: -1) Error 1005 Can't create table '#sql-temporary' (errno: -1)
create index idx on bug46000(id); create index idx on bug46000(id);
drop table bug46000; drop table bug46000;

4
mysql-test/t/innodb_bug44369.test
View File

@ -13,9 +13,9 @@ create table bug44369 (DB_ROW_ID int) engine=innodb;
--error ER_CANT_CREATE_TABLE --error ER_CANT_CREATE_TABLE
create table bug44369 (db_row_id int) engine=innodb; create table bug44369 (db_row_id int) engine=innodb;
show errors; show warnings;
--error ER_CANT_CREATE_TABLE --error ER_CANT_CREATE_TABLE
create table bug44369 (db_TRX_Id int) engine=innodb; create table bug44369 (db_TRX_Id int) engine=innodb;
show errors; show warnings;

4
mysql-test/t/innodb_bug46000.test
View File

@ -14,7 +14,7 @@ create table bug46000(`id` int,key `GEN_CLUST_INDEX`(`id`))engine=innodb;
--error ER_CANT_CREATE_TABLE --error ER_CANT_CREATE_TABLE
create table bug46000(`id` int, key `GEN_clust_INDEX`(`id`))engine=innodb; create table bug46000(`id` int, key `GEN_clust_INDEX`(`id`))engine=innodb;
show errors; show warnings;
create table bug46000(id int) engine=innodb; create table bug46000(id int) engine=innodb;
@ -24,7 +24,7 @@ create table bug46000(id int) engine=innodb;
create index GEN_CLUST_INDEX on bug46000(id); create index GEN_CLUST_INDEX on bug46000(id);
--replace_regex /'[^']*test.#sql-[0-9a-f_]*'/'#sql-temporary'/ --replace_regex /'[^']*test.#sql-[0-9a-f_]*'/'#sql-temporary'/
show errors; show warnings;
# This 'create index' operation should succeed, no # This 'create index' operation should succeed, no
# temp table left from last failed create index # temp table left from last failed create index

4
storage/innobase/handler/ha_innodb.cc
View File

@ -5194,7 +5194,7 @@ create_table_def(
if (dict_col_name_is_reserved(field->field_name)){ if (dict_col_name_is_reserved(field->field_name)){
push_warning_printf( push_warning_printf(
(THD*) trx->mysql_thd, (THD*) trx->mysql_thd,
MYSQL_ERROR::WARN_LEVEL_ERROR, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_CANT_CREATE_TABLE, ER_CANT_CREATE_TABLE,
"Error creating table '%s' with " "Error creating table '%s' with "
"column name '%s'. '%s' is a " "column name '%s'. '%s' is a "
@ -8525,7 +8525,7 @@ innobase_index_name_is_reserved(
innobase_index_reserve_name) == 0) { innobase_index_reserve_name) == 0) {
/* Push warning to mysql */ /* Push warning to mysql */
push_warning_printf((THD*) trx->mysql_thd, push_warning_printf((THD*) trx->mysql_thd,
MYSQL_ERROR::WARN_LEVEL_ERROR, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_CANT_CREATE_TABLE, ER_CANT_CREATE_TABLE,
"Cannot Create Index with name " "Cannot Create Index with name "
"'%s'. The name is reserved " "'%s'. The name is reserved "