List:Commits« Previous MessageNext Message »
From:Jonathan Miller Date:January 12 2006 4:05pm
Subject:bk commit into 5.1 tree (jmiller:1.2047)
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.2047 06/01/12 17:05:25 jmiller@stripped +10 -0
  rpl_sp.test, disabled.def, rpl_stm_mystery22.test:
    Test cleanip per lars
  .del-rpl_row_sp000.result~2b24650b123e20a9:
    Delete: mysql-test/r/rpl_row_sp000.result
  .del-rpl_row_sp000.test~645e2807516682b6:
    Delete: mysql-test/t/rpl_row_sp000.test
  .del-rpl_row_sp000-slave.opt~d84baa1f59616d77:
    Delete: mysql-test/t/rpl_row_sp000-slave.opt
  .del-rpl_row_sp000-master.opt~da625c0a51a2f08a:
    Delete: mysql-test/t/rpl_row_sp000-master.opt
  rpl_sp.result:
    Rename: mysql-test/r/rpl_stm_sp.result -> mysql-test/r/rpl_sp.result
  rpl_sp-master.opt:
    Rename: mysql-test/t/rpl_stm_sp-master.opt -> mysql-test/t/rpl_sp-master.opt
  rpl_sp-slave.opt:
    Rename: mysql-test/t/rpl_stm_sp-slave.opt -> mysql-test/t/rpl_sp-slave.opt
  rpl_sp.test:
    Rename: mysql-test/t/rpl_stm_sp.test -> mysql-test/t/rpl_sp.test

  mysql-test/t/rpl_sp.test
    1.14 06/01/12 17:05:03 jmiller@stripped +0 -1
    Test cleanip per lars

  mysql-test/t/disabled.def
    1.37 06/01/12 17:04:46 jmiller@stripped +1 -2
    Test cleanip per lars

  mysql-test/t/rpl_stm_mystery22.test
    1.9 06/01/12 17:04:38 jmiller@stripped +16 -2
    Test cleanip per lars

  BitKeeper/deleted/.del-rpl_row_sp000.result~2b24650b123e20a9
    1.3 06/01/12 16:50:30 jmiller@stripped +0 -0
    Delete: mysql-test/r/rpl_row_sp000.result

  BitKeeper/deleted/.del-rpl_row_sp000.test~645e2807516682b6
    1.3 06/01/12 16:50:12 jmiller@stripped +0 -0
    Delete: mysql-test/t/rpl_row_sp000.test

  BitKeeper/deleted/.del-rpl_row_sp000-slave.opt~d84baa1f59616d77
    1.2 06/01/12 16:50:12 jmiller@stripped +0 -0
    Delete: mysql-test/t/rpl_row_sp000-slave.opt

  BitKeeper/deleted/.del-rpl_row_sp000-master.opt~da625c0a51a2f08a
    1.2 06/01/12 16:50:12 jmiller@stripped +0 -0
    Delete: mysql-test/t/rpl_row_sp000-master.opt

  mysql-test/r/rpl_sp.result
    1.17 06/01/12 16:45:07 jmiller@stripped +0 -0
    Rename: mysql-test/r/rpl_stm_sp.result -> mysql-test/r/rpl_sp.result

  mysql-test/t/rpl_sp-master.opt
    1.3 06/01/12 16:44:43 jmiller@stripped +0 -0
    Rename: mysql-test/t/rpl_stm_sp-master.opt -> mysql-test/t/rpl_sp-master.opt

  mysql-test/t/rpl_sp-slave.opt
    1.4 06/01/12 16:44:16 jmiller@stripped +0 -0
    Rename: mysql-test/t/rpl_stm_sp-slave.opt -> mysql-test/t/rpl_sp-slave.opt

  mysql-test/t/rpl_sp.test
    1.13 06/01/12 16:43:25 jmiller@stripped +0 -0
    Rename: mysql-test/t/rpl_stm_sp.test -> mysql-test/t/rpl_sp.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.12/mysql-test/t/rpl_stm_sp.test	2006-01-04 22:36:21 +01:00
+++ 1.14/mysql-test/t/rpl_sp.test	2006-01-12 17:05:03 +01:00
@@ -1,5 +1,4 @@
 # row-based and statement have expected binlog difference in result files
--- source include/have_binlog_format_statement.inc
 
 # Test of replication of stored procedures (WL#2146 for MySQL 5.0)
 # Modified by WL#2971.

--- 1.36/mysql-test/t/disabled.def	2006-01-11 19:31:04 +01:00
+++ 1.37/mysql-test/t/disabled.def	2006-01-12 17:04:46 +01:00
@@ -18,8 +18,7 @@
 innodb_concurrent : Results are not deterministic, Elliot will fix (BUG#3300)
 subselect       : Bug#15706
 type_time       : Bug#15805
-#rpl000002       : Bug#15920 Temporary tables are not binlogged in SBR
-#ps_7ndb         : Bug#15923 Core dump in RBR mode when executing test suite
 rpl_ddl         : Bug#15963 SBR does not show "Definer" correctly
 mysqlslap       : Bug#16167
 events          : Affects flush test case. A table lock not released somewhere
+rpl_sp          : Bug #16456

--- 1.8/mysql-test/t/rpl_stm_mystery22.test	2005-12-22 05:10:56 +01:00
+++ 1.9/mysql-test/t/rpl_stm_mystery22.test	2006-01-12 17:04:38 +01:00
@@ -1,7 +1,21 @@
--- source include/have_binlog_format_statement.inc
-
+################################
+# Change Author: JBM
+# Change Date: 2006-01-12
+# Change: Added back have stm binlog
+# and added requirments comments
+################################
 # test case to make slave thread get ahead by 22 bytes
+################################
+#REQUIREMENT: If there is a faked slave duplicate key insert 
+#error and the slave is restarted, the replication should 
+#proceed in a correct way.
+################################
+#REQUIREMENT: If there is a faked slave non-existing record 
+#delete error and the slave is restarted, then the replication 
+#should proceed in a correct way.
+#################################
 
+-- source include/have_binlog_format_statement.inc
 -- source include/master-slave.inc
 
 # first, cause a duplicate key problem on the slave
Thread
bk commit into 5.1 tree (jmiller:1.2047)Jonathan Miller12 Jan