bzr commit into mysql-6.0 branch (marc.alff:2807) Bug#39059

[Marc Alff]

#At file:///home/malff/BZR-TREE/mysql-6.0-39059/

 2807 Marc Alff	2008-08-27
      Bug#39059 (push_warning_printf: Warnings are raised as errors)
      
      Fixed the calls to push_warning_printf() to not report WARN_LEVEL_ERROR
      warnings.
modified:
  mysql-test/r/backup_security.result
  mysql-test/r/maria3.result
  mysql-test/r/myisam.result
  sql/backup/logger.cc
  sql/sql_table.cc

=== modified file 'mysql-test/r/backup_security.result'
--- a/mysql-test/r/backup_security.result	2007-12-03 20:28:32 +0000
+++ b/mysql-test/r/backup_security.result	2008-08-27 15:48:32 +0000
@@ -28,14 +28,12 @@ ERROR 42000: Access denied; you need the
 SHOW ERRORS;
 Level	Code	Message
 Error	1227	Access denied; you need the SUPER privilege for this operation
-Error	1227	Access denied; you need the SUPER privilege for this operation
 no_rights: Attempting restore. Should fail with error 1227
 RESTORE FROM 'bup_no_rights.bak';
 ERROR 42000: Access denied; you need the SUPER privilege for this operation
 SHOW ERRORS;
 Level	Code	Message
 Error	1227	Access denied; you need the SUPER privilege for this operation
-Error	1227	Access denied; you need the SUPER privilege for this operation
 SELECT * FROM backup_test.t1;
 a
 01 Test #1 - super privilege

=== modified file 'mysql-test/r/maria3.result'
--- a/mysql-test/r/maria3.result	2008-07-04 08:28:36 +0000
+++ b/mysql-test/r/maria3.result	2008-08-27 15:48:32 +0000
@@ -468,7 +468,7 @@ drop table t1;
 create table t1 (n int not null, c char(1)) engine=maria transactional=1;
 alter table t1 engine=myisam;
 Warnings:
-Error	1478	Table storage engine 'MyISAM' does not support the create option 'TRANSACTIONAL=1'
+Warning	1478	Table storage engine 'MyISAM' does not support the create option 'TRANSACTIONAL=1'
 alter table t1 engine=maria;
 show create table t1;
 Table	Create Table
@@ -479,7 +479,7 @@ t1	CREATE TABLE `t1` (
 drop table t1;
 create table t1 (n int not null, c char(1)) engine=myisam transactional=1;
 Warnings:
-Error	1478	Table storage engine 'MyISAM' does not support the create option 'TRANSACTIONAL=1'
+Warning	1478	Table storage engine 'MyISAM' does not support the create option 'TRANSACTIONAL=1'
 alter table t1 engine=maria;
 show create table t1;
 Table	Create Table

=== modified file 'mysql-test/r/myisam.result'
--- a/mysql-test/r/myisam.result	2008-08-25 18:23:27 +0000
+++ b/mysql-test/r/myisam.result	2008-08-27 15:48:32 +0000
@@ -2245,7 +2245,7 @@ Key Start Len Index   Type
 DROP TABLE t1;
 create table t1 (n int not null, c char(1)) transactional=1;
 Warnings:
-Error	1478	Table storage engine 'MyISAM' does not support the create option 'TRANSACTIONAL=1'
+Warning	1478	Table storage engine 'MyISAM' does not support the create option 'TRANSACTIONAL=1'
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

=== modified file 'sql/backup/logger.cc'
--- a/sql/backup/logger.cc	2008-03-21 09:57:45 +0000
+++ b/sql/backup/logger.cc	2008-08-27 15:48:32 +0000
@@ -50,7 +50,7 @@ int Logger::write_message(log_level::val
        errors.push_front(new MYSQL_ERROR(::current_thd, error_code,
                                          MYSQL_ERROR::WARN_LEVEL_ERROR, msg));
      sql_print_error(out);
-     push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
+     push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                          error_code, msg);
      DBUG_PRINT("backup_log",("[ERROR] %s", out));
      

=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2008-08-26 19:16:28 +0000
+++ b/sql/sql_table.cc	2008-08-27 15:48:32 +0000
@@ -3537,7 +3537,7 @@ bool mysql_create_table_no_lock(THD *thd
 
   /* Give warnings for not supported table options */
   if (create_info->transactional && !file->ht->commit)
-    push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
+    push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                         ER_ILLEGAL_HA_CREATE_OPTION,
                         ER(ER_ILLEGAL_HA_CREATE_OPTION),
                         file->engine_name()->str,