bk commit into 5.0 tree (guilhem:1.1975) BUG#12559

[guilhem]

Below is the list of changes that have just been committed into a local
5.0 repository of guilhem. When guilhem 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.1975 05/09/15 15:50:44 guilhem@stripped +2 -0
  Wl#1012: Enabling rpl_row_sp007 which does not fail anymore (good results). Looks like BUG#12559
  "Transaction Rollbacks not replicated in rbr. Data on slave not matching master."
  has been fixed.

  mysql-test/r/rpl_row_sp007.result
    1.1 05/09/15 15:50:40 guilhem@stripped +50 -0
    good result for the test

  mysql-test/t/disabled.def
    1.13 05/09/15 15:50:40 guilhem@stripped +0 -1
    this test does not fail anymore

  mysql-test/r/rpl_row_sp007.result
    1.0 05/09/15 15:50:40 guilhem@stripped +0 -0
    BitKeeper file /home/mysql_src/mysql-5.0-wl1012/mysql-test/r/rpl_row_sp007.result

# 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:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.0-wl1012
--- New file ---
+++ mysql-test/r/rpl_row_sp007.result	05/09/15 15:50:40
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;
DROP PROCEDURE IF EXISTS test.p1;
DROP TABLE IF EXISTS test.t2;
CREATE PROCEDURE test.p1(IN i INT)
BEGIN
DECLARE CONTINUE HANDLER FOR sqlexception BEGIN END;
DROP TABLE IF EXISTS test.t1;
CREATE TABLE test.t1 (num INT,PRIMARY KEY(num))ENGINE=INNODB;
START TRANSACTION;
INSERT INTO test.t1 VALUES(i);
savepoint t1_save;
INSERT INTO test.t1 VALUES (14);
ROLLBACK to savepoint t1_save;
COMMIT;
END|

< ---- Master selects-- >
-------------------------
CALL test.p1(12);
Warnings:
Note	1051	Unknown table 't1'
SELECT * FROM test.t1;
num
12

< ---- Slave selects-- >
------------------------
SELECT * FROM test.t1;
num
12

< ---- Master selects-- >
-------------------------
CALL test.p1(13);
SELECT * FROM test.t1;
num
13

< ---- Slave selects-- >
------------------------
SELECT * FROM test.t1;
num
13
DROP PROCEDURE IF EXISTS test.p1;
DROP TABLE IF EXISTS test.t1;


--- 1.12/mysql-test/t/disabled.def	2005-09-14 16:20:10 +02:00
+++ 1.13/mysql-test/t/disabled.def	2005-09-15 15:50:40 +02:00
@@ -33,7 +33,6 @@
 rpl_row_sp003:Bug 12335
 rpl_row_sp005:Bug 12586
 rpl_row_sp006:Bug 12586
-rpl_row_sp007:Bug 12559
 rpl_row_sp008:Bug 12627
 rpl_row_sp009:Bug 12168
 rpl_row_sp010:Bug 11126