List:Commits« Previous MessageNext Message »
From:Sven Sandberg Date:October 19 2009 8:26am
Subject:bzr commit into mysql-5.1-rep+3 branch (sven.sandberg:3111) Bug#39934
View as plain text  
#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;


Attachment: [text/bzr-bundle] bzr/sven.sandberg@sun.com-20091019082622-qibp3cru93s1mvcy.bundle
Thread
bzr commit into mysql-5.1-rep+3 branch (sven.sandberg:3111) Bug#39934Sven Sandberg19 Oct