MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:Lars Thalmann Date:September 15 2005 4:09pm
Subject:bk commit into 5.0 tree (lars:1.1978) BUG#12134
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of lthalmann. When lthalmann 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.1978 05/09/15 18:09:39 lars@stripped +2 -0
  BUG#12134: Fixed in earlier commit

  mysql-test/r/rpl_row_multi_update3.result
    1.1 05/09/15 18:09:31 lars@stripped +124 -0
    Result file

  mysql-test/t/disabled.def
    1.16 05/09/15 18:09:31 lars@stripped +1 -1
    Enabled test

  mysql-test/r/rpl_row_multi_update3.result
    1.0 05/09/15 18:09:31 lars@stripped +0 -0
    BitKeeper file /users/lthalmann/bk/mysql-5.0-wl1012/mysql-test/r/rpl_row_multi_update3.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:	lars
# Host:	dl145h.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.0-wl1012

--- 1.15/mysql-test/t/disabled.def	2005-09-15 17:57:21 +02:00
+++ 1.16/mysql-test/t/disabled.def	2005-09-15 18:09:31 +02:00
@@ -22,7 +22,7 @@
 rpl_row_relayrotate:Transaction Rollbacks not replicated Bug 12559
 rpl_row_rewrt_db:rewrite is not working when using rbr Bug 12424
 rpl_row_timezone:Timestamp incorrectly replicated Bug 12443
-rpl_row_multi_update3:Slave-CORE Bug 12134
+#rpl_row_multi_update3:Slave-CORE Bug 12134
 rpl_row_000002:create table from temporary Bug 12345
 rpl_row_sp000:Rename from rpl_row_sp.test Bug 12134 Slave-CORE
 #rpl_multi_delete:Bug 12536 Slave Core
--- New file ---
+++ mysql-test/r/rpl_row_multi_update3.result	05/09/15 18:09:31
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;

-------- Test for BUG#9361 --------
CREATE TABLE t1 (
a int unsigned not null auto_increment primary key,
b int unsigned
) ENGINE=MyISAM;
CREATE TABLE t2 (
a int unsigned not null auto_increment primary key,
b int unsigned
) ENGINE=MyISAM;
INSERT INTO t1 VALUES (NULL, 0);
INSERT INTO t1 SELECT NULL, 0 FROM t1;
INSERT INTO t2 VALUES (NULL, 0), (NULL,1);
SELECT * FROM t1 ORDER BY a;
a	b
1	0
2	0
SELECT * FROM t2 ORDER BY a;
a	b
1	0
2	1
UPDATE t2, (SELECT a FROM t1) AS t SET t2.b = t.a+5 ;
SELECT * FROM t1 ORDER BY a;
a	b
1	0
2	0
SELECT * FROM t2 ORDER BY a;
a	b
1	6
2	6
SELECT * FROM t1 ORDER BY a;
a	b
1	0
2	0
SELECT * FROM t2 ORDER BY a;
a	b
1	6
2	6
drop table t1,t2;

-------- Test 1 for BUG#9361 --------
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;
CREATE TABLE t1 (
a1  char(30),
a2  int,
a3  int,
a4  char(30),
a5  char(30)
);
CREATE TABLE t2 (
b1  int,
b2  char(30)
);
INSERT INTO t1 VALUES ('Yes', 1, NULL, 'foo', 'bar');
INSERT INTO t2 VALUES (1, 'baz');
UPDATE t1 a, t2 
SET    a.a1 = 'No' 
WHERE  a.a2 = 
(SELECT  b1 
FROM    t2 
WHERE   b2 = 'baz') 
AND a.a3 IS NULL 
AND a.a4 = 'foo' 
AND a.a5 = 'bar';
SELECT * FROM t1;
a1	a2	a3	a4	a5
No	1	NULL	foo	bar
SELECT * FROM t2;
b1	b2
1	baz
DROP TABLE t1, t2;

-------- Test 2 for BUG#9361 --------
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;
DROP TABLE IF EXISTS t3;
CREATE TABLE t1 (
i   INT,
j   INT,
x   INT,
y   INT,
z   INT
);
CREATE TABLE t2 (
i   INT,
k   INT,
x   INT,
y   INT,
z   INT
);
CREATE TABLE t3 (
j   INT,
k   INT,
x   INT,
y   INT,
z   INT
);
INSERT INTO t1 VALUES ( 1, 2,13,14,15);
INSERT INTO t2 VALUES ( 1, 3,23,24,25);
INSERT INTO t3 VALUES ( 2, 3, 1,34,35), ( 2, 3, 1,34,36);
UPDATE      t1 AS a  
INNER JOIN  t2 AS b 
ON a.i = b.i
INNER JOIN  t3 AS c 
ON a.j = c.j  AND  b.k = c.k
SET         a.x = b.x, 
a.y = b.y, 
a.z = (
SELECT  sum(z) 
FROM    t3
WHERE   y = 34 
) 
WHERE       b.x = 23;
SELECT * FROM t1;
i	j	x	y	z
1	2	23	24	71
DROP TABLE t1, t2, t3;

Thread
bk commit into 5.0 tree (lars:1.1978) BUG#12134Lars Thalmann15 Sep