diff options
| author | Vladislav Vaintroub <vvaintroub@fedora12> | 2009-12-25 16:49:21 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@fedora12> | 2009-12-25 16:49:21 +0100 |
| commit | 16ebad8bb068bff9238d854c29f3ad2f115bec5d (patch) | |
| tree | 7759e1bcb9d4f5273bfcaada45aac3885f5cd8fe /mysql-test/suite/sys_vars/t/interactive_timeout_basic.test | |
| parent | 354a628e54692d958e05863e80d4682dbb5d63bf (diff) | |
| parent | 9016688fca04deb8f838f83269fd9b99c88aa5ac (diff) | |
| download | mariadb-git-16ebad8bb068bff9238d854c29f3ad2f115bec5d.tar.gz | |
merge
Diffstat (limited to 'mysql-test/suite/sys_vars/t/interactive_timeout_basic.test')
| -rw-r--r-- | mysql-test/suite/sys_vars/t/interactive_timeout_basic.test | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mysql-test/suite/sys_vars/t/interactive_timeout_basic.test b/mysql-test/suite/sys_vars/t/interactive_timeout_basic.test index 0c1a6716348..5f7d0e157f8 100644 --- a/mysql-test/suite/sys_vars/t/interactive_timeout_basic.test +++ b/mysql-test/suite/sys_vars/t/interactive_timeout_basic.test @@ -104,8 +104,8 @@ SET @@global.interactive_timeout = -1024; SELECT @@global.interactive_timeout; SET @@global.interactive_timeout = 1000000000; SELECT @@global.interactive_timeout; ---Error ER_PARSE_ERROR -SET @@global.interactive_timeout = 65530.34.; +--Error ER_WRONG_TYPE_FOR_VAR +SET @@global.interactive_timeout = 65530.34; SELECT @@global.interactive_timeout; --Error ER_WRONG_TYPE_FOR_VAR SET @@global.interactive_timeout = test; @@ -115,11 +115,10 @@ SET @@session.interactive_timeout = 0; SELECT @@session.interactive_timeout; SET @@session.interactive_timeout = -2; SELECT @@session.interactive_timeout; ---Error ER_PARSE_ERROR -SET @@session.interactive_timeout = 65530.34.; +--Error ER_WRONG_TYPE_FOR_VAR +SET @@session.interactive_timeout = 65530.34; SET @@session.interactive_timeout = 100000000; SELECT @@session.interactive_timeout; -echo 'Bug # 34837: Errors are not coming on assigning invalid values to variable'; --Error ER_WRONG_TYPE_FOR_VAR SET @@session.interactive_timeout = test; |