bk commit into 5.0 tree (gshchepa:1.2595) BUG#34223

[<gshchepa]

Below is the list of changes that have just been committed into a local
5.0 repository of gshchepa.  When gshchepa does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-07 11:12:49+04:00, gshchepa@stripped +4 -0
  innodb_mysql.test, variables.result, variables.test, innodb_mysql.result:
    Minor post-fix for bug#34223.

  mysql-test/r/innodb_mysql.result@stripped, 2008-02-07 11:11:31+04:00, gshchepa@stripped +6 -0
    Minor post-fix for bug#34223.

  mysql-test/r/variables.result@stripped, 2008-02-07 11:11:44+04:00, gshchepa@stripped +0 -6
    Minor post-fix for bug#34223.

  mysql-test/t/innodb_mysql.test@stripped, 2008-02-07 11:11:49+04:00, gshchepa@stripped +14 -0
    Minor post-fix for bug#34223.

  mysql-test/t/variables.test@stripped, 2008-02-07 11:11:51+04:00, gshchepa@stripped +0 -13
    Minor post-fix for bug#34223.

diff -Nrup a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
--- a/mysql-test/r/innodb_mysql.result	2007-12-13 14:52:47 +04:00
+++ b/mysql-test/r/innodb_mysql.result	2008-02-07 11:11:31 +04:00
@@ -1240,4 +1240,10 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `aa` (`a`(1))
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 drop table t1;
+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;
 End of 5.0 tests
diff -Nrup a/mysql-test/r/variables.result b/mysql-test/r/variables.result
--- a/mysql-test/r/variables.result	2008-02-07 04:10:08 +04:00
+++ b/mysql-test/r/variables.result	2008-02-07 11:11:44 +04:00
@@ -838,12 +838,6 @@ SELECT @@log_slow_queries;
 1
 SET GLOBAL log_slow_queries=0;
 ERROR HY000: Variable 'log_slow_queries' is a read only variable
-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;
 End of 5.0 tests
 set global binlog_cache_size         =@my_binlog_cache_size;
 set global connect_timeout           =@my_connect_timeout;
diff -Nrup a/mysql-test/t/innodb_mysql.test b/mysql-test/t/innodb_mysql.test
--- a/mysql-test/t/innodb_mysql.test	2007-12-13 14:52:47 +04:00
+++ b/mysql-test/t/innodb_mysql.test	2008-02-07 11:11:49 +04:00
@@ -982,4 +982,18 @@ desc t1;
 show create table t1;
 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
diff -Nrup a/mysql-test/t/variables.test b/mysql-test/t/variables.test
--- a/mysql-test/t/variables.test	2008-02-07 04:10:10 +04:00
+++ b/mysql-test/t/variables.test	2008-02-07 11:11:51 +04:00
@@ -696,19 +696,6 @@ SELECT @@log_slow_queries;
 --error 1238
 SET GLOBAL log_slow_queries=0;
 
-#
-# 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
 
 # This is at the very after the versioned tests, since it involves doing