Commit e9f25875 authored by sergefp@pslp.mylan's avatar sergefp@pslp.mylan
Browse files

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  mysql.com:/home/psergey/mysql-5.0-bug27732
parents 954a16c6 83bb97b4

mysql-test/r/innodb_mysql.result

+6 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/r/variables.result

+0 −6
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/innodb_mysql.test

+14 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/t/variables.test

+0 −13
Original line number Diff line number Diff line
@@ -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