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

into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam


mysql-test/t/disabled.def:
  Auto merged

mysql-test/include/mix1.inc

@@ -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

+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

@@ -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

@@ -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

@@ -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

mysql-test/t/client_xml.test

 # Can't run with embedded server
 -- source include/not_embedded.inc
 
+# Disable concurrent inserts to avoid test failures when reading
+# data from concurrent connections (insert might return before
+# the data is actually in the table).
+set @old_concurrent_insert= @@global.concurrent_insert;
+set @@global.concurrent_insert= 0;
+
 # Test of the xml output of the 'mysql' and 'mysqldump' clients -- makes
 # sure that basic encoding issues are handled properly
 create table t1 (
@@ -21,3 +27,6 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
 --exec $MYSQL --xml test -vv -e "select 1 limit 0"
 
 drop table t1;
+
+# Restore global concurrent_insert value
+set @@global.concurrent_insert= @old_concurrent_insert;

mysql-test/t/disabled.def

@@ -10,7 +10,6 @@
 #
 ##############################################################################
 federated_transactions   : Bug#29523 Transactions do not work
-innodb_mysql         : Bug#32724: innodb_mysql.test fails randomly
 status               : Bug#32966 main.status fails
 ps_ddl               : Bug#12093 2007-12-14 pending WL#4165 / WL#4166
 csv_alter_table      : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables

mysql-test/t/federated.test

@@ -2,6 +2,14 @@
 --source include/not_embedded.inc
 --source include/federated.inc
 
+connection default;
+
+# Disable concurrent inserts to avoid test failures when reading
+# data from concurrent connections (insert might return before
+# the data is actually in the table).
+SET @OLD_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
+SET @@GLOBAL.CONCURRENT_INSERT= 0;
+
 connection slave;
 DROP TABLE IF EXISTS federated.t1;
 CREATE TABLE federated.t1 (
@@ -1857,3 +1865,7 @@ drop server 's1';
 
 --echo End of 5.1 tests
 source include/federated_cleanup.inc;
+
+connection default;
+
+SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT;

mysql-test/t/federated_bug_25714.test

 --source include/have_bug25714.inc
 source include/federated.inc;
 
+connection default;
+
+# Disable concurrent inserts to avoid test failures when reading
+# data from concurrent connections (insert might return before
+# the data is actually in the table).
+SET @OLD_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
+SET @@GLOBAL.CONCURRENT_INSERT= 0;
 
 connection slave;
 --disable_warnings
@@ -42,6 +49,8 @@ DROP TABLE federated.t1;
 connection slave;
 DROP TABLE federated.t1;
 
-
 source include/federated_cleanup.inc;
 
+connection default;
+
+SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT;

sql/sql_parse.cc

@@ -3301,6 +3301,7 @@ end_with_restore_list:
         can free its locks if LOCK TABLES locked some tables before finding
         that it can't lock a table in its list
       */
+      ha_autocommit_or_rollback(thd, 1);
       end_active_trans(thd);
       thd->options&= ~(OPTION_TABLE_LOCK);
     }