mirror of
https://github.com/MariaDB/server.git
synced 2025-11-30 05:23:50 +03:00
Merge of compatibility fixes
Fixed failing tests in sys_vars as we have now stricter checking of setting of variables. mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_random_read_ahead_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_stats_on_metadata_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/rpl_semi_sync_master_enabled_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_enabled_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_large_prefix_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_random_read_ahead_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_stats_on_metadata_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_strict_mode_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test: One can now only assign 0 or 1 to boolean variables mysys/my_getsystime.c: Merge + fixed bug that __NR_clock_gettime didn't work in 5.5
This commit is contained in:
@@ -9,7 +9,9 @@ INSERT INTO bug_61209 VALUES (), ();
|
||||
# Connection con1
|
||||
SET SESSION auto_increment_increment=3;
|
||||
SET SESSION auto_increment_offset=2;
|
||||
SELECT GET_LOCK('a', 10);
|
||||
SELECT GET_LOCK('a', 9);
|
||||
GET_LOCK('a', 9)
|
||||
1
|
||||
|
||||
# Connection con2
|
||||
SET SESSION auto_increment_increment=3;
|
||||
@@ -17,14 +19,10 @@ SET SESSION auto_increment_offset=2;
|
||||
INSERT INTO bug_61209 (a) VALUES (NULL), (NULL), (NULL + GET_LOCK('a', 10));
|
||||
|
||||
# Connection con1 reap
|
||||
GET_LOCK('a', 10)
|
||||
1
|
||||
INSERT INTO bug_61209 (a) VALUES (NULL), (NULL), (NULL);
|
||||
SELECT RELEASE_LOCK('a');
|
||||
|
||||
# Connection con2 reap
|
||||
|
||||
# Connection con1 reap
|
||||
RELEASE_LOCK('a')
|
||||
1
|
||||
|
||||
# Connection con2 reap
|
||||
DROP TABLE bug_61209;
|
||||
|
||||
Reference in New Issue
Block a user