Applying InnoDB snashot 5.1-ss6129

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.

4 files changed, 12 insertions, 12 deletions

diff --git a/mysql-test/r/innodb_bug44369.result b/mysql-test/r/innodb_bug44369.result
index e4b84ecac19..9cf79aeffab 100644
--- a/mysql-test/r/innodb_bug44369.result
+++ b/mysql-test/r/innodb_bug44369.result
@@ -2,13 +2,13 @@ create table bug44369 (DB_ROW_ID int) engine=innodb;
 ERROR HY000: Can't create table 'test.bug44369' (errno: -1)
 create table bug44369 (db_row_id int) engine=innodb;
 ERROR HY000: Can't create table 'test.bug44369' (errno: -1)
-show errors;
+show warnings;
 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)
 create table bug44369 (db_TRX_Id int) engine=innodb;
 ERROR HY000: Can't create table 'test.bug44369' (errno: -1)
-show errors;
+show warnings;
 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)
diff --git a/mysql-test/r/innodb_bug46000.result b/mysql-test/r/innodb_bug46000.result
index ccff888a48d..ccf7cc56859 100644
--- a/mysql-test/r/innodb_bug46000.result
+++ b/mysql-test/r/innodb_bug46000.result
@@ -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)
 create table bug46000(`id` int, key `GEN_clust_INDEX`(`id`))engine=innodb;
 ERROR HY000: Can't create table 'test.bug46000' (errno: -1)
-show errors;
+show warnings;
 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)
 create table bug46000(id int) engine=innodb;
 create index GEN_CLUST_INDEX on bug46000(id);
 ERROR HY000: Can't create table '#sql-temporary' (errno: -1)
-show errors;
+show warnings;
 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)
 create index idx on bug46000(id);
 drop table bug46000;
diff --git a/mysql-test/t/innodb_bug44369.test b/mysql-test/t/innodb_bug44369.test
index 495059eb5e6..238dc3d8fb1 100644
--- a/mysql-test/t/innodb_bug44369.test
+++ b/mysql-test/t/innodb_bug44369.test
@@ -13,9 +13,9 @@ create table bug44369 (DB_ROW_ID int) engine=innodb;
 --error ER_CANT_CREATE_TABLE
 create table bug44369 (db_row_id int) engine=innodb;
 
-show errors;
+show warnings;
 
 --error ER_CANT_CREATE_TABLE
 create table bug44369 (db_TRX_Id int) engine=innodb;
 
-show errors;
+show warnings;
diff --git a/mysql-test/t/innodb_bug46000.test b/mysql-test/t/innodb_bug46000.test
index 80c18c58ef0..eb10d866e54 100644
--- a/mysql-test/t/innodb_bug46000.test
+++ b/mysql-test/t/innodb_bug46000.test
@@ -14,7 +14,7 @@ create table bug46000(`id` int,key `GEN_CLUST_INDEX`(`id`))engine=innodb;
 --error ER_CANT_CREATE_TABLE
 create table bug46000(`id` int, key `GEN_clust_INDEX`(`id`))engine=innodb;
 
-show errors;
+show warnings;
 
 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);
 
 --replace_regex /'[^']*test.#sql-[0-9a-f_]*'/'#sql-temporary'/
-show errors;
+show warnings;
 
 # This 'create index' operation should succeed, no
 # temp table left from last failed create index