Commit b5b0765d authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/sql_parse.cc:
  Auto merged
parents 81a7a93f 7eaa6dc1

mysql-test/lib/mtr_cases.pl

+8 −0
Original line number Diff line number Diff line
@@ -154,6 +154,14 @@ sub collect_one_test_case($$$$$) { 
    }

  }



  if ( defined mtr_match_prefix($tname,"federated") )

  {

    $tinfo->{'slave_num'}= 1;           # Default, use one slave



    # FIXME currently we always restart slaves

    $tinfo->{'slave_restart'}= 1;

  }



  # FIXME what about embedded_server + ndbcluster, skip ?!



  my $master_opt_file= "$testdir/$tname-master.opt";

mysql-test/r/rpl_multi_update3.result

0 → 100644
+43 −0
Original line number Diff line number Diff line 
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 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;

mysql-test/t/rpl_multi_update3.test

0 → 100644
+34 −0
Original line number Diff line number Diff line 
# Let's verify that multi-update with a subselect does not cause the slave to crash

# (BUG#10442)



source include/master-slave.inc;



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;

SELECT * FROM t2 ORDER BY a;



UPDATE t2, (SELECT a FROM t1) AS t SET t2.b = t.a+5 ;

SELECT * FROM t1 ORDER BY a;

SELECT * FROM t2 ORDER BY a;



save_master_pos;

connection slave;

sync_with_master;

SELECT * FROM t1 ORDER BY a;

SELECT * FROM t2 ORDER BY a;



drop table t1,t2;