bzr commit into mysql-5.5-cluster branch (jonas.oreland:3376)

[Jonas Oreland]

#At file:///home/jonas/src/cluster-5.5/ based on revid:magnus.blaudd@stripped

 3376 Jonas Oreland	2011-06-27
      ndb - in 5.5 it's no longer possible to push an error(MYSQL_ERROR::WARN_LEVEL_ERROR) using push_warning (assert). Change to use MYSQL_ERROR::WARN_LEVEL_WARN instead

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-06-27 10:16:18 +0000
+++ b/sql/ha_ndbcluster.cc	2011-06-27 11:30:44 +0000
@@ -4540,7 +4540,7 @@ handle_conflict_op_error(Thd_ndb* thd_nd
           }
           else
           {
-            push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
+            push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                                 ER_EXCEPTIONS_WRITE_ERROR,
                                 ER(ER_EXCEPTIONS_WRITE_ERROR), msg);
             /* Slave will stop replication. */
@@ -4574,7 +4574,7 @@ handle_conflict_op_error(Thd_ndb* thd_nd
           }
           else
           {
-            push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
+            push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                                 ER_EXCEPTIONS_WRITE_ERROR,
                                 ER(ER_EXCEPTIONS_WRITE_ERROR), msg);
             /* Slave will stop replication. */

=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-06-22 11:29:27 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-06-27 11:30:44 +0000
@@ -4376,7 +4376,7 @@ ndbcluster_get_binlog_replication_info(T
                                  tmp_buf,
                                  sizeof(tmp_buf)) != 0)
       {
-        push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
+        push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                             ER_CONFLICT_FN_PARSE_ERROR,
                             ER(ER_CONFLICT_FN_PARSE_ERROR),
                             tmp_buf);
@@ -4424,7 +4424,7 @@ ndbcluster_apply_binlog_replication_info
                           args,
                           num_args) != 0)
     {
-      push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
+      push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                           ER_CONFLICT_FN_PARSE_ERROR,
                           ER(ER_CONFLICT_FN_PARSE_ERROR),
                           tmp_buf);


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