From: Sven Sandberg
Date: October 19 2009 8:26am
Subject: bzr commit into mysql-5.1-rep+3 branch (sven.sandberg:3111) Bug#39934
List-Archive: http://lists.mysql.com/commits/87256
X-Bug: 39934
Message-Id: <0KRR006IU64BDS80@fe-emea-10.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_2mvt0DGaKYMi35BcvgX6nA)"

--Boundary_(ID_2mvt0DGaKYMi35BcvgX6nA)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///home/sven/bzr/b39934-mats-slave_row_engine/5.1-rep%2B3/ based on revid:zhenxing.he@stripped

 3111 Sven Sandberg	2009-10-19
      BUG#39934: Slave stops for engine that only support row-based logging
      post-push fixes. the test case tried to use a udf that had not been loaded. removed the udf.
     @ mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result
        updated result file
     @ mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test
        myfunc_int() was supposed to be a udf. but the udf was not loaded.
        since the test already uses another plugin, and we don't support
        multiple plugin directories, i removed the udf function. it was not
        strictly needed.

    modified:
      mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result	2009-10-14 16:32:08 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result	2009-10-19 08:26:22 +0000
@@ -70,7 +70,7 @@ SET @@session.binlog_format = MIXED;
 INSERT INTO t_stmt VALUES (UUID());
 ERROR HY000: Cannot execute statement: binlogging of unsafe statement is impossible when storage engine is limited to statement-logging and BINLOG_FORMAT = MIXED.  Reason for unsafeness: Statement uses a system function whose value may differ on slave.
 * Multi-unsafe statement and stmt-only engine
-INSERT DELAYED INTO t_double_autoinc SELECT CONCAT(UUID(), @@hostname, myfunc_int(), NULL) FROM mysql.general_log LIMIT 1;
+INSERT DELAYED INTO t_double_autoinc SELECT CONCAT(UUID(), @@hostname, NULL) FROM mysql.general_log LIMIT 1;
 ERROR HY000: Cannot execute statement: binlogging of unsafe statement is impossible when storage engine is limited to statement-logging and BINLOG_FORMAT = MIXED.  Reason for unsafeness: Statement uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
 ---- binlog_format=statement ----
 [on slave]
@@ -125,6 +125,8 @@ set global sql_slave_skip_counter=1;
 include/start_slave.inc
 [on master]
 ==== Clean up ====
+DROP TRIGGER trig_autoinc;
+DROP TRIGGER trig_double_autoinc;
 DROP TABLE t, t_self_logging, t_row, t_stmt, t_slave_stmt, t_autoinc, t_double_autoinc;
 DROP DATABASE other;
 SET @@global.binlog_format = @old_binlog_format;

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test	2009-10-18 03:57:38 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test	2009-10-19 08:26:22 +0000
@@ -139,11 +139,11 @@ SET @@session.binlog_format = MIXED;
 --error ER_BINLOG_UNSAFE_AND_STMT_ENGINE
 INSERT INTO t_stmt VALUES (UUID());
 
-# Concatenate three unsafe values, and then concatenate NULL to
+# Concatenate two unsafe values, and then concatenate NULL to
 # that so that the result is NULL and we instead use autoinc.
 --echo * Multi-unsafe statement and stmt-only engine
 --error ER_BINLOG_UNSAFE_AND_STMT_ENGINE
-INSERT DELAYED INTO t_double_autoinc SELECT CONCAT(UUID(), @@hostname, myfunc_int(), NULL) FROM mysql.general_log LIMIT 1;
+INSERT DELAYED INTO t_double_autoinc SELECT CONCAT(UUID(), @@hostname, NULL) FROM mysql.general_log LIMIT 1;
 
 
 --echo ---- binlog_format=statement ----
@@ -228,6 +228,8 @@ INSERT INTO t VALUES (UUID());
 
 --echo ==== Clean up ====
 
+DROP TRIGGER trig_autoinc;
+DROP TRIGGER trig_double_autoinc;
 DROP TABLE t, t_self_logging, t_row, t_stmt, t_slave_stmt, t_autoinc, t_double_autoinc;
 DROP DATABASE other;
 SET @@global.binlog_format = @old_binlog_format;


--Boundary_(ID_2mvt0DGaKYMi35BcvgX6nA)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/sven.sandberg@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/sven.sandberg@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: sven.sandberg@stripped
# target_branch: file:///home/sven/bzr/b39934-mats-\
#   slave_row_engine/5.1-rep%2B3/
# testament_sha1: 8f266eb7762ae64e75f876aca6628e37a0bca6a2
# timestamp: 2009-10-19 10:26:36 +0200
# source_branch: file:///home/sven/bzr/b39934-mats-\
#   slave_row_engine/5.1-bugteam/
# base_revision_id: zhenxing.he@stripped\
#   3dgcvf6n2rq91wtd
# 
# Begin bundle
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
AXUMJvKLUiB4rKXWP8XckU4UJCyw/DHA


--Boundary_(ID_2mvt0DGaKYMi35BcvgX6nA)--