Commit 3c469aaa authored by gkodinov/kgeorge@magare.gmz's avatar gkodinov/kgeorge@magare.gmz
Browse files

Merge bk-internal:/home/bk/mysql-5.1 

into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
parents 5fa0982a e24f509d

mysql-test/include/mix1.inc

+1 −0
Original line number Diff line number Diff line
@@ -1309,6 +1309,7 @@ SELECT * FROM t1; 


--echo # Switch to connection con2

connection con2;

--reap

SELECT * FROM t1;



--echo # Switch to connection con1

mysql-test/r/client_xml.result

+3 −0
Original line number Diff line number Diff line 
set @old_concurrent_insert= @@global.concurrent_insert;

set @@global.concurrent_insert= 0;

create table t1 (

`a&b` int,

`a<b` int,
@@ -86,3 +88,4 @@ Empty set 


Bye

drop table t1;

set @@global.concurrent_insert= @old_concurrent_insert;

mysql-test/r/federated.result

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ DROP DATABASE IF EXISTS federated; 
CREATE DATABASE federated;

DROP DATABASE IF EXISTS federated;

CREATE DATABASE federated;

SET @OLD_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;

SET @@GLOBAL.CONCURRENT_INSERT= 0;

DROP TABLE IF EXISTS federated.t1;

Warnings:

Note	1051	Unknown table 't1'
@@ -2123,3 +2125,4 @@ DROP TABLE IF EXISTS federated.t1; 
DROP DATABASE IF EXISTS federated;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT;

mysql-test/r/federated_bug_25714.result

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ DROP DATABASE IF EXISTS federated; 
CREATE DATABASE federated;

DROP DATABASE IF EXISTS federated;

CREATE DATABASE federated;

SET @OLD_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;

SET @@GLOBAL.CONCURRENT_INSERT= 0;

DROP TABLE IF EXISTS federated.bug_13118_table;

CREATE TABLE federated.t1 (

`id` int auto_increment primary key,
@@ -54,3 +56,4 @@ DROP TABLE IF EXISTS federated.t1; 
DROP DATABASE IF EXISTS federated;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT;

mysql-test/r/innodb_mysql.result

+11 −11
Original line number Diff line number Diff line
@@ -887,13 +887,13 @@ EXPLAIN SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY a; 
id	1

select_type	SIMPLE

table	t1

type	index

type	range

possible_keys	bkey

key	PRIMARY

key_len	4

key	bkey

key_len	5

ref	NULL

rows	32

Extra	Using where

rows	16

Extra	Using where; Using index; Using filesort

SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY a;

a	b

1	2
@@ -982,13 +982,13 @@ EXPLAIN SELECT * FROM t2 WHERE b=1 ORDER BY a; 
id	1

select_type	SIMPLE

table	t2

type	index

type	ref

possible_keys	bkey

key	PRIMARY

key_len	4

ref	NULL

rows	16

Extra	Using where; Using index

key	bkey

key_len	5

ref	const

rows	8

Extra	Using where; Using index; Using filesort

SELECT * FROM t2 WHERE b=1 ORDER BY a;

a	b	c

1	1	1