bzr push into mysql-5.5.0-next-mr branch (alik:2897 to 2898) Bug#47233

[Alexander Nozdrin]

 2898 Alexander Nozdrin	2009-10-20
      A fix for innodb_bug44369.test due to Bug#47233 (Innodb calls
      push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR)).
      
      The Signal/Resignal patch changes the push_warning() API: now
      it silently downgrades WARN_LEVEL_ERROR to WARN_LEVEL_WARN.
      
      This patch should be rolled back when Bug#47233 is fixed.

    modified:
      mysql-test/r/innodb_bug44369.result
      mysql-test/t/innodb_bug44369.test
 2897 Alexander Nozdrin	2009-10-19 [merge]
      Automerge from mysql-trunk-merge.

    modified:
      scripts/make_binary_distribution.sh
      scripts/mysql_config.sh
      scripts/mysqld_safe.sh
      support-files/mysql.spec.sh
=== modified file 'mysql-test/r/innodb_bug44369.result'
--- a/mysql-test/r/innodb_bug44369.result	2009-10-16 11:58:02 +0000
+++ b/mysql-test/r/innodb_bug44369.result	2009-10-20 09:37:07 +0000
@@ -2,13 +2,13 @@ create table bug44369 (DB_ROW_ID int) en
 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)

=== modified file 'mysql-test/t/innodb_bug44369.test'
--- a/mysql-test/t/innodb_bug44369.test	2009-10-16 11:58:02 +0000
+++ b/mysql-test/t/innodb_bug44369.test	2009-10-20 09:37:07 +0000
@@ -13,9 +13,15 @@ create table bug44369 (DB_ROW_ID int) en
 --error ER_CANT_CREATE_TABLE
 create table bug44369 (db_row_id int) engine=innodb;
 
-show errors;
+# TODO: after Bug#47233 is fixed, 'show warning' should be replaced by 'show
+# errors' again.
+# show errors;
+show warnings;
 
 --error ER_CANT_CREATE_TABLE
 create table bug44369 (db_TRX_Id int) engine=innodb;
 
-show errors;
+# TODO: after Bug#47233 is fixed, 'show warning' should be replaced by 'show
+# errors' again.
+# show errors;
+show warnings;


Attachment: [text/bzr-bundle] bzr/[e-mail]