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/new_basic.test | |
parent | 354a628e54692d958e05863e80d4682dbb5d63bf (diff) | |
parent | 9016688fca04deb8f838f83269fd9b99c88aa5ac (diff) | |
download | mariadb-git-16ebad8bb068bff9238d854c29f3ad2f115bec5d.tar.gz |
merge
Diffstat (limited to 'mysql-test/suite/sys_vars/t/new_basic.test')
-rw-r--r-- | mysql-test/suite/sys_vars/t/new_basic.test | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/mysql-test/suite/sys_vars/t/new_basic.test b/mysql-test/suite/sys_vars/t/new_basic.test index cf0ba08dfdb..017ba2eb264 100644 --- a/mysql-test/suite/sys_vars/t/new_basic.test +++ b/mysql-test/suite/sys_vars/t/new_basic.test @@ -121,7 +121,7 @@ SET @@global.new = FELSE; SET @@global.new = -1024; --Error ER_WRONG_VALUE_FOR_VAR SET @@global.new = 65536; ---Error ER_WRONG_VALUE_FOR_VAR +--Error ER_WRONG_TYPE_FOR_VAR SET @@global.new = 65530.34; --Error ER_WRONG_VALUE_FOR_VAR SET @@global.new = test; @@ -130,17 +130,14 @@ SET @@global.new = test; SET @@session.new = ONN; --Error ER_WRONG_VALUE_FOR_VAR SET @@session.new = ONF; - +--Error ER_WRONG_VALUE_FOR_VAR SET @@session.new = OF; -SELECT @@session.new; ---echo 'Bug# 34828: FN_DYNVARS_113_05 - OF is also working as OFF and no error is coming'; - --Error ER_WRONG_VALUE_FOR_VAR SET @@session.new = 'OFN'; --Error ER_WRONG_VALUE_FOR_VAR SET @@session.new = -2; ---Error ER_PARSE_ERROR -SET @@session.new = 65530.34.; +--Error ER_WRONG_TYPE_FOR_VAR +SET @@session.new = 65530.34; --Error ER_WRONG_VALUE_FOR_VAR SET @@session.new = 65550; |