mirror of
https://github.com/MariaDB/server.git
synced 2025-09-05 08:04:25 +03:00
a25e07bad8
because innodb_lock_wait_timeout is a settable session variable as of r2716. mysql-test/patches/innodb_lock_wait_timeout.diff: New file.
56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
--- mysql-test/t/innodb_lock_wait_timeout_basic.test.orig 2008-08-04 09:28:16.000000000 +0300
|
|
+++ mysql-test/t/innodb_lock_wait_timeout_basic.test 2008-10-07 11:14:15.000000000 +0300
|
|
@@ -37,10 +37,6 @@
|
|
# Check if Value can set #
|
|
####################################################################
|
|
|
|
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
|
|
-SET @@GLOBAL.innodb_lock_wait_timeout=1;
|
|
---echo Expected error 'Read only variable'
|
|
-
|
|
SELECT COUNT(@@GLOBAL.innodb_lock_wait_timeout);
|
|
--echo 1 Expected
|
|
|
|
@@ -84,13 +80,9 @@
|
|
SELECT COUNT(@@innodb_lock_wait_timeout);
|
|
--echo 1 Expected
|
|
|
|
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
|
|
SELECT COUNT(@@local.innodb_lock_wait_timeout);
|
|
---echo Expected error 'Variable is a GLOBAL variable'
|
|
|
|
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
|
|
SELECT COUNT(@@SESSION.innodb_lock_wait_timeout);
|
|
---echo Expected error 'Variable is a GLOBAL variable'
|
|
|
|
SELECT COUNT(@@GLOBAL.innodb_lock_wait_timeout);
|
|
--echo 1 Expected
|
|
--- mysql-test/r/innodb_lock_wait_timeout_basic.result.orig 2008-08-04 09:27:50.000000000 +0300
|
|
+++ mysql-test/r/innodb_lock_wait_timeout_basic.result 2008-10-07 11:15:14.000000000 +0300
|
|
@@ -4,9 +4,6 @@
|
|
1
|
|
1 Expected
|
|
'#---------------------BS_STVARS_032_02----------------------#'
|
|
-SET @@GLOBAL.innodb_lock_wait_timeout=1;
|
|
-ERROR HY000: Variable 'innodb_lock_wait_timeout' is a read only variable
|
|
-Expected error 'Read only variable'
|
|
SELECT COUNT(@@GLOBAL.innodb_lock_wait_timeout);
|
|
COUNT(@@GLOBAL.innodb_lock_wait_timeout)
|
|
1
|
|
@@ -39,11 +36,11 @@
|
|
1
|
|
1 Expected
|
|
SELECT COUNT(@@local.innodb_lock_wait_timeout);
|
|
-ERROR HY000: Variable 'innodb_lock_wait_timeout' is a GLOBAL variable
|
|
-Expected error 'Variable is a GLOBAL variable'
|
|
+COUNT(@@local.innodb_lock_wait_timeout)
|
|
+1
|
|
SELECT COUNT(@@SESSION.innodb_lock_wait_timeout);
|
|
-ERROR HY000: Variable 'innodb_lock_wait_timeout' is a GLOBAL variable
|
|
-Expected error 'Variable is a GLOBAL variable'
|
|
+COUNT(@@SESSION.innodb_lock_wait_timeout)
|
|
+1
|
|
SELECT COUNT(@@GLOBAL.innodb_lock_wait_timeout);
|
|
COUNT(@@GLOBAL.innodb_lock_wait_timeout)
|
|
1
|