From: Jonas Oreland
Date: June 27 2011 11:30am
Subject: bzr commit into mysql-5.5-cluster branch (jonas.oreland:3376)
List-Archive: http://lists.mysql.com/commits/139896
Message-Id: <20110627113103.3624E9E5159@perch.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7368593538135475272=="

--===============7368593538135475272==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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);


--===============7368593538135475272==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jonas.oreland@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonas.oreland@stripped\
#   dhd4rwrzmivj8j8i
# target_branch: file:///home/jonas/src/cluster-5.5/
# testament_sha1: 35beb2b123355747413f66f9c6ef59e02228f377
# timestamp: 2011-06-27 13:31:02 +0200
# base_revision_id: magnus.blaudd@stripped\
#   yufx6akvyveoyimh
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQ9JQbIAAjRfgBRQUOf/93oX
uaC////wUAUZeOJR3enCgdvdrXCSRQyYkep6jZT0Rk9AnpBpo00aaDRo0EpIMmSZkFNknpNGmhoA
NAAA9QJJCT9JBqabU9J6mjIAAAZBoAAbVKDQNAANAAA0GgAAZAkkEBomExAEnhJDE8ppp6RkyGmi
QYasl8GNNlegfXsSx0VvhEpO9rxwUvOcJ1AoBnudmsdpdGZhmDThSq+KJ3zUqkZpQJNBo03Jyds+
XRaG7ZFYNv9Di05cFBH9uGfeelGPw8093BfL5Qxtm7EPZBxu8PmMx09I6BSE0jI+qFQfUrd6gJBy
lzxOVpotNmlfE4hhcuAk9BqyGsgbSwihM28QXD0dC0tOoGoeRQvdujHYxOiZQs5uKYf3akU0K231
W6BShM5msoREasCTUuycpcjd+ZVkgFDCQHmxPrI+d1zDW6NrDPQmQuYMKB4u2MN7+wesj1hepBIQ
lSixH5nLRSQWCXbUrbVIPLzVAaYGSlRMgZWJPRaVDSc2TVKfZMNqKz7DXBdhqMw5lEjAZBeOWtrk
8cRqwnIQL04mAnelrGeUERrFSYYXFcORgB6jKzFxfAbFouKrUr29DnxBUsnLY5sGFSiUxmMDia2K
szEkXPHoVY6baR9mrDC4wqtQyl/ytpCpTXvhwGrchdOxyLsjCZ5wRlYTjtd7h5jilUVah51LH2YD
PYfYQGeV408aoypmxsHEw77gEQuLitnSYovrHFJaOZs3DTergc4moFig2S7WzsizFBReIM7RV1Dz
bQqc2AtjFZSibWVPEt6RFAzJmb3jfvF/JbhUOQ19QwXaOJxCTH0Ph7BRAaCBDESBSUQIkS9hMjzV
FJMlkF6h5+1kTIqMrhNj68ZjjHFjtIBbINkWfxmEq5CV6MwWlqunLVa0CJaLiWtEdsRkcpw/Y/T2
abmK9vkiItNfRegZ9aa8D2oOISqYtOBwOZMeYSiSLQqPjtuizCU/6inEnbiazVwCRf4QzPSJdOBq
xMzIsCQQMNpCYnRw3BAAzDsUHoB4LvT8c6162AM8X5a5+ceUDEkdTfuPFnWliHEKtCrjdIU2Wo9C
9PHA2L4cdaS4JgZSyhxczgvZ26LlBEiZHyHD3hkG3Wcbj5Dzflk5PsVp9jsYGPUsNsD8OI0VA6Jk
dhNaODMvNvgMkfPuDffeHICgtbyIFRwMknjkMcOVjX2+5DTz2LATiSzHdkWVSYOSmsD28MaKEczs
ijJBqievACYCB/JtTFctxlWaIleb13NwQRc4SyDj1HSEnBRnz2rTMroStK0K0bFD1WOkXjJugGht
KOZRQqSkfFzBaMIiRQyCiwUpJShtuiSfAcRIljQwMmYIhBXOXCVzEPddVU6SiRwrQc9qFcBKRGlB
xrsemnzkxalekSBdgoUEiTXjpd2UzgyQxMcdjzAeaDUUmmzBhDJB3+jkEFvGC/xwXwKddYehSVK8
rR8DhRRBSaSNQxVFZ5AUFhatYEHCMHIJSWGSzO9wpHrkIQ6Ied6A8vee9mao8yVuDtliWoUbdI7s
yLzcDGMSkKlJgGaUO4ynIdY6umApxOg4I1BDmKy9wLOSjR5lIVeAmwS7kFQtiLQJEjt4pskYnjEC
9MRKUrhFYBtgoTGVTTl6+EnAl/i7kinChIB6Sg2Q


--===============7368593538135475272==--