Merge mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1

into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl


client/mysqltest.c:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.cc:
  Auto merged

mysql-test/include/commit.inc

@@ -740,6 +740,6 @@ call p_verify_status_increment(0, 0, 0, 0);
 --echo #
 --echo # Cleanup
 --echo #
-drop table t1;
+drop table t1, t2, t3;
 drop procedure p_verify_status_increment;
 drop function f1;

mysql-test/include/connect2.inc

@@ -0,0 +1,56 @@
+# include/connect2.inc
+#
+# SUMMARY
+# 
+#   Make several attempts to connect.
+#
+# USAGE
+#
+# EXAMPLE
+# 
+#   connect.test
+#
+
+--disable_query_log
+
+let $wait_counter= 300;
+if ($wait_timeout)
+{
+  let $wait_counter= `SELECT $wait_timeout * 10`;
+}
+# Reset $wait_timeout so that its value won't be used on subsequent
+# calls, and default will be used instead.
+let $wait_timeout= 0;
+
+--echo # -- Establishing connection '$con_name' (user: $con_user_name)...
+
+while ($wait_counter)
+{
+    --disable_abort_on_error
+    --disable_result_log
+    --connect ($con_name,localhost,$con_user_name)
+    --enable_result_log
+    --enable_abort_on_error
+
+    let $error = $mysql_errno;
+
+    if (!$error)
+    {
+        let $wait_counter= 0;
+    }
+    if ($error)
+    {
+        real_sleep 0.1;
+        dec $wait_counter;
+    }
+}
+if ($error)
+{
+  --echo # -- Error: can not establish connection '$con_name'.
+}
+if (!$error)
+{
+  --echo # -- Connection '$con_name' has been established.
+}
+
+--enable_query_log

mysql-test/include/ctype_common.inc

@@ -13,6 +13,8 @@
 
 SET @safe_character_set_server= @@character_set_server;
 SET @safe_collation_server= @@collation_server;
+SET @safe_character_set_client= @@character_set_client;
+SET @safe_character_set_results= @@character_set_results;
 SET character_set_server= @test_character_set;
 SET collation_server= @test_collation;
 CREATE DATABASE d1;
@@ -62,8 +64,22 @@ select a sounds like a from t1;
 select 1 from t1 order by cast(a as char(1));
 drop table t1;
 
+#
+# Bug#27580 SPACE() function collation bug?
+#
+set names utf8;
+create table t1 (
+  name varchar(10),
+  level smallint unsigned);
+show create table t1;
+insert into t1 values ('string',1);
+select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
+drop table t1;
+
 DROP DATABASE d1;
 # Restore settings
 USE test;
 SET character_set_server= @safe_character_set_server;
 SET collation_server= @safe_collation_server;
+SET character_set_client= @safe_character_set_client;
+SET character_set_results= @safe_character_set_results;

mysql-test/include/mix1.inc

@@ -1090,6 +1090,19 @@ SELECT * FROM t1 WHERE id=191 OR id IS NULL ORDER BY d;
 
 DROP TABLE t1;
 
+#
+# Bug #34223: Assertion failed: (optp->var_type & 127) == 8,
+#             file .\my_getopt.c, line 830
+#
+
+set @my_innodb_autoextend_increment=@@global.innodb_autoextend_increment;
+set global innodb_autoextend_increment=8;
+set global innodb_autoextend_increment=@my_innodb_autoextend_increment;
+
+set @my_innodb_commit_concurrency=@@global.innodb_commit_concurrency;
+set global innodb_commit_concurrency=0;
+set global innodb_commit_concurrency=@my_innodb_commit_concurrency;
+
 --echo End of 5.0 tests
 
 # Fix for BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY

mysql-test/include/wait_for_slave_sql_to_stop.inc

@@ -9,7 +9,10 @@
 #         sql threads to stop
 #      3) If loops too long die.
 ####################################################
-connection slave;
+if (!$keep_connection)
+{
+  connection slave;
+}
 let $row_number= 1;
 let $run= 1;
 let $counter= 300;