Commit 8c7b197a authored by davi@endora.local's avatar davi@endora.local
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 

into  mysql.com:/Users/davi/mysql/mysql-5.1-bugteam
parents e0034718 0c2a0e80

mysql-test/r/innodb.result

+15 −15
Original line number Diff line number Diff line
@@ -925,7 +925,7 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t1	index	NULL	b	4	NULL	#	Using index

explain select a,b from t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	#	

1	SIMPLE	t1	index	NULL	b	4	NULL	#	Using index

explain select a,b,c from t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	#
@@ -1166,14 +1166,14 @@ UPDATE t1 set a=a+100 where b between 2 and 3 and a < 1000; 
SELECT * from t1;

a	b

1	1

102	2

103	3

4	4

5	5

6	6

7	7

8	8

9	9

102	2

103	3

drop table t1;

CREATE TABLE t1 (a int not null primary key, b int not null, key (b)) engine=innodb;

CREATE TABLE t2 (a int not null primary key, b int not null, key (b)) engine=innodb;
@@ -1197,6 +1197,7 @@ a b 
update t1,t2 set t1.a=t1.a+100 where t1.a=101;

select * from t1;

a	b

201	1

102	2

103	3

104	4
@@ -1208,11 +1209,10 @@ a b 
110	10

111	11

112	12

201	1

update t1,t2 set t1.b=t1.b+10 where t1.b=2;

select * from t1;

a	b

102	12

201	1

103	3

104	4

105	5
@@ -1222,34 +1222,34 @@ a b 
109	9

110	10

111	11

102	12

112	12

201	1

update t1,t2 set t1.b=t1.b+2,t2.b=t1.b+10 where t1.b between 3 and 5 and t1.a=t2.a+100;

select * from t1;

a	b

102	12

201	1

103	5

104	6

105	7

106	6

105	7

107	7

108	8

109	9

110	10

111	11

102	12

112	12

201	1

select * from t2;

a	b

1	1

2	2

3	13

4	14

5	15

6	6

7	7

8	8

9	9

3	13

4	14

5	15

drop table t1,t2;

CREATE TABLE t2 (   NEXT_T         BIGINT NOT NULL PRIMARY KEY) ENGINE=MyISAM;

CREATE TABLE t1 (  B_ID           INTEGER NOT NULL PRIMARY KEY) ENGINE=InnoDB;
@@ -1300,11 +1300,11 @@ insert into t1 (id) values (null),(null),(null),(null),(null); 
update t1 set fk=69 where fk is null order by id limit 1;

SELECT * from t1;

id	fk

1	69

2	NULL

3	NULL

4	NULL

5	NULL

1	69

drop table t1;

create table t1 (a int not null, b int not null, key (a));

insert into t1 values (1,1),(1,2),(1,3),(3,1),(3,2),(3,3),(3,1),(3,2),(3,3),(2,1),(2,2),(2,3);
@@ -2438,8 +2438,8 @@ insert into t1 (b) values (1); 
replace into t1 (b) values (2), (1), (3);

select * from t1;

a	b

2	2

3	1

2	2

4	3

truncate table t1;

insert into t1 (b) values (1);
@@ -2448,8 +2448,8 @@ replace into t1 (b) values (1); 
replace into t1 (b) values (3);

select * from t1;

a	b

2	2

3	1

2	2

4	3

drop table t1;

create table t1 (rowid int not null auto_increment, val int not null,primary

mysql-test/r/innodb_mysql.result

+18 −8
Original line number Diff line number Diff line
@@ -355,13 +355,13 @@ EXPLAIN 
SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id

WHERE t1.name LIKE 'A%';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	PRIMARY,name	PRIMARY	4	NULL	3	Using where

1	SIMPLE	t1	index	PRIMARY,name	name	23	NULL	3	Using where; Using index

1	SIMPLE	t2	ref	fkey	fkey	5	test.t1.id	1	Using where; Using index

EXPLAIN

SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id

WHERE t1.name LIKE 'A%' OR FALSE;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	index	NULL	PRIMARY	4	NULL	5	

1	SIMPLE	t2	index	NULL	fkey	5	NULL	5	Using index

1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.fkey	1	Using where

DROP TABLE t1,t2;

CREATE TABLE t1 (
@@ -1268,11 +1268,11 @@ select_type SIMPLE 
table	t1

type	index

possible_keys	NULL

key	PRIMARY

key_len	4

key	b

key_len	5

ref	NULL

rows	3

Extra	Using filesort

Extra	Using index; Using filesort

SELECT * FROM t1 ORDER BY b ASC, a DESC;

a	b

1	1
@@ -1284,11 +1284,11 @@ select_type SIMPLE 
table	t1

type	index

possible_keys	NULL

key	PRIMARY

key_len	4

key	b

key_len	5

ref	NULL

rows	3

Extra	Using filesort

Extra	Using index; Using filesort

SELECT * FROM t1 ORDER BY b DESC, a ASC;

a	b

2	2
@@ -1654,3 +1654,13 @@ ALTER TABLE t1 CHANGE id id2 INT; 
DROP TABLE t2;

DROP TABLE t1;

End of 5.1 tests

drop table if exists t1, t2, t3;

create table t1(a int);

insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);

create table t2 (a int, b int, pk int, key(a,b), primary key(pk)) engine=innodb;

insert into t2 select @a:=A.a+10*(B.a + 10*C.a),@a, @a from t1 A, t1 B, t1 C;

this must use key 'a', not PRIMARY:

explain select a from t2 where a=b;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	index	NULL	a	10	NULL	#	Using where; Using index

drop table t1, t2;

mysql-test/r/join_outer_innodb.result

+2 −2
Original line number Diff line number Diff line
@@ -8,12 +8,12 @@ EXPLAIN 
SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 

WHERE t1.name LIKE 'A%';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	PRIMARY,name	PRIMARY	4	NULL	3	Using where

1	SIMPLE	t1	index	PRIMARY,name	name	23	NULL	3	Using where; Using index

1	SIMPLE	t2	ref	fkey	fkey	5	test.t1.id	1	Using where; Using index

EXPLAIN

SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 

WHERE t1.name LIKE 'A%' OR FALSE;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	index	NULL	PRIMARY	4	NULL	5	

1	SIMPLE	t2	index	NULL	fkey	5	NULL	5	Using index

1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.fkey	1	Using where

DROP TABLE t1,t2;

mysql-test/suite/rpl/r/rpl_ddl.result

+32 −20
Original line number Diff line number Diff line
@@ -420,9 +420,9 @@ TEST-INFO: MASTER: The INSERT is not committed (Succeeded) 
-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

5

6



TEST-INFO: SLAVE:  The INSERT is not committed (Succeeded)

TEST-INFO: SLAVE:  The INSERT is committed (Failed)



-------- switch to master -------

SHOW TABLES LIKE 't23';
@@ -445,7 +445,7 @@ MAX(f1) 
-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

5

6



-------- switch to master -------

RENAME TABLE mysqltest1.t3 to mysqltest1.t20;
@@ -614,9 +614,9 @@ TEST-INFO: MASTER: The INSERT is not committed (Succeeded) 
-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

8

9



TEST-INFO: SLAVE:  The INSERT is not committed (Succeeded)

TEST-INFO: SLAVE:  The INSERT is committed (Failed)



-------- switch to master -------
@@ -631,7 +631,7 @@ MAX(f1) 
-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

8

9



-------- switch to master -------

TRUNCATE TABLE mysqltest1.t7;
@@ -1086,6 +1086,9 @@ Modified # 
Created	#

Security_type	DEFINER

Comment	

character_set_client	latin1

collation_connection	latin1_swedish_ci

Database Collation	latin1_swedish_ci



-------- switch to slave --------

SHOW PROCEDURE STATUS LIKE 'p1';
@@ -1097,6 +1100,9 @@ Modified # 
Created	#

Security_type	DEFINER

Comment	

character_set_client	latin1

collation_connection	latin1_swedish_ci

Database Collation	latin1_swedish_ci



-------- switch to master -------
@@ -1149,6 +1155,9 @@ Modified # 
Created	#

Security_type	DEFINER

Comment	I have been altered

character_set_client	latin1

collation_connection	latin1_swedish_ci

Database Collation	latin1_swedish_ci



-------- switch to slave --------

SHOW PROCEDURE STATUS LIKE 'p1';
@@ -1160,6 +1169,9 @@ Modified # 
Created	#

Security_type	DEFINER

Comment	I have been altered

character_set_client	latin1

collation_connection	latin1_swedish_ci

Database Collation	latin1_swedish_ci



-------- switch to master -------
@@ -1251,13 +1263,13 @@ TEST-INFO: SLAVE: The INSERT is committed (Succeeded) 


-------- switch to master -------

SHOW CREATE VIEW v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`

View	Create View	character_set_client	collation_connection

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`	latin1	latin1_swedish_ci



-------- switch to slave --------

SHOW CREATE VIEW v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`

View	Create View	character_set_client	collation_connection

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`	latin1	latin1_swedish_ci



-------- switch to master -------
@@ -1302,13 +1314,13 @@ TEST-INFO: SLAVE: The INSERT is committed (Succeeded) 


-------- switch to master -------

SHOW CREATE VIEW v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`

View	Create View	character_set_client	collation_connection

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`	latin1	latin1_swedish_ci



-------- switch to slave --------

SHOW CREATE VIEW v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`

View	Create View	character_set_client	collation_connection

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`	latin1	latin1_swedish_ci



-------- switch to master -------
@@ -1402,13 +1414,13 @@ TEST-INFO: SLAVE: The INSERT is committed (Succeeded) 


-------- switch to master -------

SHOW TRIGGERS;

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer

trg1	INSERT	t1	SET @a:=1	BEFORE	NULL		root@localhost

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation

trg1	INSERT	t1	SET @a:=1	BEFORE	NULL		root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci



-------- switch to slave --------

SHOW TRIGGERS;

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer

trg1	INSERT	t1	SET @a:=1	BEFORE	NULL		root@localhost

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation

trg1	INSERT	t1	SET @a:=1	BEFORE	NULL		root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci



-------- switch to master -------
@@ -1453,11 +1465,11 @@ TEST-INFO: SLAVE: The INSERT is committed (Succeeded) 


-------- switch to master -------

SHOW TRIGGERS;

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation



-------- switch to slave --------

SHOW TRIGGERS;

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation



-------- switch to master -------

mysql-test/suite/rpl/r/rpl_innodb_bug28430.result

+0 −39
Original line number Diff line number Diff line
@@ -114,45 +114,6 @@ Create Table CREATE TABLE `byrange_tbl` ( 
  `filler` varchar(255) DEFAULT NULL,

  PRIMARY KEY (`id`)

) ENGINE=InnoDB AUTO_INCREMENT=1001 DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (id) SUBPARTITION BY HASH (id) SUBPARTITIONS 2 (PARTITION pa1 VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION pa2 VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION pa3 VALUES LESS THAN (30) ENGINE = InnoDB, PARTITION pa4 VALUES LESS THAN (40) ENGINE = InnoDB, PARTITION pa5 VALUES LESS THAN (50) ENGINE = InnoDB, PARTITION pa6 VALUES LESS THAN (60) ENGINE = InnoDB, PARTITION pa7 VALUES LESS THAN (70) ENGINE = InnoDB, PARTITION pa8 VALUES LESS THAN (80) ENGINE = InnoDB, PARTITION pa9 VALUES LESS THAN (90) ENGINE = InnoDB, PARTITION pa10 VALUES LESS THAN (100) ENGINE = InnoDB, PARTITION pa11 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */

SHOW SLAVE STATUS;

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	root

Master_Port	MASTER_PORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	945470

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	Yes

Slave_SQL_Running	Yes

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	#

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	945470

Relay_Log_Space	#

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

Last_IO_Errno	#

Last_IO_Error	#

Last_SQL_Errno	0

Last_SQL_Error	

SELECT count(*) "Slave norm" FROM test.regular_tbl;

Slave norm	500

SELECT count(*) "Slave bykey" FROM test.bykey_tbl;