List:Commits« Previous MessageNext Message »
From:Jonathan Miller Date:January 11 2006 7:02pm
Subject:bk commit into 5.1 tree (jmiller:1.2034)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2034 06/01/11 20:02:11 jmiller@stripped +9 -0
  RBR test updates per lars request

  BitKeeper/deleted/.del-rpl_row_EE_err.result~5ad217703f686c4d
    1.2 06/01/11 20:01:37 jmiller@stripped +0 -0
    Delete: mysql-test/r/rpl_row_EE_err.result

  BitKeeper/deleted/.del-rpl_row_EE_err.test~6cd033708a4535db
    1.2 06/01/11 20:01:25 jmiller@stripped +0 -0
    Delete: mysql-test/t/rpl_row_EE_err.test

  BitKeeper/deleted/.del-rpl_row_EE_err.test~b3d8db3eacbb7af5
    1.2 06/01/11 20:01:06 jmiller@stripped +0 -0
    Delete: mysql-test/extra/rpl_tests/rpl_row_EE_err.test

  mysql-test/r/rpl_stm_EE_err2.result
    1.1 06/01/11 20:00:43 jmiller@stripped +13 -0
    New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars

  mysql-test/r/rpl_stm_EE_err2.result
    1.0 06/01/11 20:00:43 jmiller@stripped +0 -0
    BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_stm_EE_err2.result

  mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
    1.1 06/01/11 20:00:29 jmiller@stripped +30 -0
    New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars

  mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
    1.0 06/01/11 20:00:29 jmiller@stripped +0 -0
    BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test

  mysql-test/t/rpl_stm_EE_err2.test
    1.1 06/01/11 20:00:19 jmiller@stripped +8 -0
    New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars

  mysql-test/t/rpl_stm_EE_err2.test
    1.0 06/01/11 20:00:19 jmiller@stripped +0 -0
    BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_stm_EE_err2.test

  mysql-test/r/rpl_EE_err.result
    1.7 06/01/11 19:37:28 jmiller@stripped +0 -7
    Splitting tests case per Lars review

  mysql-test/t/rpl_EE_err.test
    1.3 06/01/11 19:34:55 jmiller@stripped +1 -1
    Splitting tests case per Lars review

  mysql-test/r/rpl_EE_err.result
    1.6 06/01/11 19:34:05 jmiller@stripped +0 -0
    Rename: mysql-test/r/rpl_stm_EE_err.result -> mysql-test/r/rpl_EE_err.result

  mysql-test/t/rpl_EE_err.test
    1.2 06/01/11 19:33:37 jmiller@stripped +0 -0
    Rename: mysql-test/t/rpl_stm_EE_err.test -> mysql-test/t/rpl_EE_err.test

  mysql-test/extra/rpl_tests/rpl_EE_err.test
    1.12 06/01/11 19:32:43 jmiller@stripped +9 -18
    Splitting tests case per Lars review

  mysql-test/extra/rpl_tests/rpl_EE_err.test
    1.11 06/01/11 19:32:11 jmiller@stripped +0 -0
    Rename: mysql-test/extra/rpl_tests/rpl_stm_EE_err.test -> mysql-test/extra/rpl_tests/rpl_EE_err.test

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jmiller
# Host:	ndb08.mysql.com
# Root:	/home/ndbdev/jmiller/clones/mysql-5.1-new

--- 1.5/mysql-test/r/rpl_stm_EE_err.result	2005-12-22 05:10:56 +01:00
+++ 1.7/mysql-test/r/rpl_EE_err.result	2006-01-11 19:37:28 +01:00
@@ -9,10 +9,3 @@
 drop table if exists t1;
 Warnings:
 Error	2	Can't find file: 't1' (errno: 2)
-create table t1 (a int, unique(a)) engine=myisam;
-set sql_log_bin=0;
-insert into t1 values(2);
-set sql_log_bin=1;
-insert into t1 values(1),(2);
-ERROR 23000: Duplicate entry '2' for key 1
-drop table t1;

--- 1.10/mysql-test/extra/rpl_tests/rpl_stm_EE_err.test	2005-12-22 05:10:54 +01:00
+++ 1.12/mysql-test/extra/rpl_tests/rpl_EE_err.test	2006-01-11 19:32:43 +01:00
@@ -2,14 +2,20 @@
 # statements that are not replicated.  The test below could be changed
 # to rely on the replication of error codes for statements that are not
 # replicated row-based.
--- source include/have_binlog_format_statement.inc
-
+#
 # See if an EE_ error in one event of the master's binlog stops replication
 # (it should not: in this configuration the EE_ error is probably not 
 # critical). Example: you do a DROP TABLE on a table which has no MYI file
 # check if START SLAVE, RESET SLAVE, CHANGE MASTER reset Last_slave_error and
 # Last_slave_errno in SHOW SLAVE STATUS (1st and 3rd commands did not: bug 986).
-
+####################################
+# Change Author: JBM
+# Change Date: 2006-01-11
+# Change: Split test per lars review
+####################################
+#"REQUIREMENT: A master DROP TABLE on a table with non-existing MYI
+# file must be correctly replicated to the slave"
+####################################
 -- source include/master-slave.inc
 
 eval create table t1 (a int) engine=$engine_type;
@@ -19,20 +25,5 @@
 save_master_pos;
 connection slave;
 sync_with_master;
-
-# Now a real error.
-
-connection master;
-eval create table t1 (a int, unique(a)) engine=$engine_type;
-set sql_log_bin=0;
-insert into t1 values(2);
-set sql_log_bin=1;
-save_master_pos;
---error 1062
-insert into t1 values(1),(2);
-drop table t1;
-save_master_pos;
-connection slave;
-wait_for_slave_to_stop;
 
 # End of 4.1 tests
--- New file ---
+++ mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test	06/01/11 20:00:29
###################################
# Author: JBM
# Date: 2006-01-11
# Purpose: Second test case from
#          rpl_EE_err.test split out
#          from orginal to make the
#          first work with both RBR and SBR
###################################
#REQUIREMENT: An INSERT with a faked duplicate entry error on
#master should be replicated to slave and force the slave to stop
#(since the slave can't cause a faked error to re-occur).
###################################

-- source include/master-slave.inc

connection master;
eval create table t1 (a int, unique(a)) engine=$engine_type;
set sql_log_bin=0;
insert into t1 values(2);
set sql_log_bin=1;
save_master_pos;
--error 1062
insert into t1 values(1),(2);
drop table t1;
save_master_pos;
connection slave;
wait_for_slave_to_stop;

# End of 4.1 tests


--- New file ---
+++ mysql-test/r/rpl_stm_EE_err2.result	06/01/11 20:00:43
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
create table t1 (a int, unique(a)) engine=myisam;
set sql_log_bin=0;
insert into t1 values(2);
set sql_log_bin=1;
insert into t1 values(1),(2);
ERROR 23000: Duplicate entry '2' for key 1
drop table t1;

--- New file ---
+++ mysql-test/t/rpl_stm_EE_err2.test	06/01/11 20:00:19
#############################
# Author: JBM
# Date: 2006-01-11
# Purpose: Engine Wrapper for rpl_stm_EE_err2.test
##############################
-- source include/have_binlog_format_statement.inc
let $engine_type=myisam;
-- source extra/rpl_tests/rpl_stm_EE_err2.test


--- 1.1/mysql-test/t/rpl_stm_EE_err.test	2005-12-22 06:35:06 +01:00
+++ 1.3/mysql-test/t/rpl_EE_err.test	2006-01-11 19:34:55 +01:00
@@ -1,2 +1,2 @@
 let $engine_type=myisam;
--- source extra/rpl_tests/rpl_stm_EE_err.test
+-- source extra/rpl_tests/rpl_EE_err.test
Thread
bk commit into 5.1 tree (jmiller:1.2034)Jonathan Miller11 Jan