Commit 7aad3ae6 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push


sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents 9683c722 5cf25d80

mysql-test/r/innodb.result

+9 −0
Original line number Diff line number Diff line
@@ -1685,3 +1685,12 @@ explain select * from t1 order by a,b,c,d; 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using filesort

drop table t1;

create table t1 (a char(1), b char(1), key(a, b)) engine=innodb;

insert into t1 values ('8', '6'), ('4', '7');

select min(a) from t1;

min(a)

4

select min(b) from t1 where a='8';

min(b)

6

drop table t1;

mysql-test/r/rpl_multi_delete2.result

+26 −3
Original line number Diff line number Diff line
@@ -4,6 +4,26 @@ reset master; 
reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

set sql_log_bin=0;

create database mysqltest_from;

set sql_log_bin=1;

create database mysqltest_to;

use mysqltest_from;

drop table if exists a;

CREATE TABLE a (i INT);

INSERT INTO a VALUES(1);

DELETE alias FROM a alias WHERE alias.i=1;

SELECT * FROM a;

i

insert into a values(2),(3);

delete a alias FROM a alias where alias.i=2;

select * from a;

i

3

use mysqltest_to;

select * from a;

i

3

create table t1 (a int);

create table t2 (a int);

insert into t1 values (1);
@@ -15,7 +35,10 @@ select * from t2; 
a

1

select * from t1;

ERROR 42S02: Table 'test.t1' doesn't exist

ERROR 42S02: Table 'mysqltest_to.t1' doesn't exist

select * from t2;

ERROR 42S02: Table 'test.t2' doesn't exist

drop table t1,t2;
 
ERROR 42S02: Table 'mysqltest_to.t2' doesn't exist

set sql_log_bin=0;

drop database mysqltest_from;

set sql_log_bin=1;

drop database mysqltest_to;

mysql-test/t/innodb.test

+9 −0
Original line number Diff line number Diff line
@@ -1230,4 +1230,13 @@ select * from t1 order by a,b,c,d; 
explain select * from t1 order by a,b,c,d;

drop table t1;



#

# BUG#11039,#13218 Wrong key length in min()

#



create table t1 (a char(1), b char(1), key(a, b)) engine=innodb;

insert into t1 values ('8', '6'), ('4', '7');

select min(a) from t1;

select min(b) from t1 where a='8';

drop table t1;

# End of 4.1 tests

mysql-test/t/rpl_multi_delete2-slave.opt

+1 −1
Original line number Diff line number Diff line 
--replicate-wild-ignore-table=test.%
 
"--replicate-rewrite-db=mysqltest_from->mysqltest_to" --replicate-do-table=mysqltest_to.a

mysql-test/t/rpl_multi_delete2.test

+44 −1
Original line number Diff line number Diff line 
#multi delete replication bugs 





source include/master-slave.inc;



#BUG#11139 - improper wild-table and table rules

#checking for multi deletes with an alias



connection master;

set sql_log_bin=0;

create database mysqltest_from;

set sql_log_bin=1;



connection slave;

create database mysqltest_to;





connection master;

use mysqltest_from;

--disable_warnings

drop table if exists a;

--enable_warnings

CREATE TABLE a (i INT);

INSERT INTO a VALUES(1);

DELETE alias FROM a alias WHERE alias.i=1;

SELECT * FROM a;

insert into a values(2),(3);

delete a alias FROM a alias where alias.i=2;

select * from a;

save_master_pos;

connection slave;



use mysqltest_to;

sync_with_master;

select * from a;



# BUG#3461

connection master;

create table t1 (a int);

create table t2 (a int);
@@ -19,7 +56,13 @@ select * from t1; 
error 1146;

select * from t2;



# cleanup

connection master;

drop table t1,t2;

set sql_log_bin=0;

drop database mysqltest_from;

set sql_log_bin=1;

connection slave;

drop database mysqltest_to;



# End of 4.1 tests