mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
innodb_mysql.test, variables.result, variables.test, innodb_mysql.result:
Minor post-fix for bug#34223. mysql-test/r/innodb_mysql.result: Minor post-fix for bug#34223. mysql-test/r/variables.result: Minor post-fix for bug#34223. mysql-test/t/innodb_mysql.test: Minor post-fix for bug#34223. mysql-test/t/variables.test: Minor post-fix for bug#34223.
This commit is contained in:
@ -1240,4 +1240,10 @@ t1 CREATE TABLE `t1` (
|
|||||||
UNIQUE KEY `aa` (`a`(1))
|
UNIQUE KEY `aa` (`a`(1))
|
||||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
||||||
drop table t1;
|
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
|
End of 5.0 tests
|
||||||
|
@ -838,12 +838,6 @@ SELECT @@log_slow_queries;
|
|||||||
1
|
1
|
||||||
SET GLOBAL log_slow_queries=0;
|
SET GLOBAL log_slow_queries=0;
|
||||||
ERROR HY000: Variable 'log_slow_queries' is a read only variable
|
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
|
End of 5.0 tests
|
||||||
set global binlog_cache_size =@my_binlog_cache_size;
|
set global binlog_cache_size =@my_binlog_cache_size;
|
||||||
set global connect_timeout =@my_connect_timeout;
|
set global connect_timeout =@my_connect_timeout;
|
||||||
|
@ -982,4 +982,18 @@ desc t1;
|
|||||||
show create table t1;
|
show create table t1;
|
||||||
drop 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
|
--echo End of 5.0 tests
|
||||||
|
@ -696,19 +696,6 @@ SELECT @@log_slow_queries;
|
|||||||
--error 1238
|
--error 1238
|
||||||
SET GLOBAL log_slow_queries=0;
|
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
|
--echo End of 5.0 tests
|
||||||
|
|
||||||
# This is at the very after the versioned tests, since it involves doing
|
# This is at the very after the versioned tests, since it involves doing
|
||||||
|
Reference in New Issue
Block a user