diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-28 15:54:16 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-28 15:54:16 +0300 |
| commit | 6c716007d13ffd74bb5c3dd7c512d4d7026a23d8 (patch) | |
| tree | 0bab5217d4ea83929d314c2ce29f962a949c95c8 /mysql-test/suite/sys_vars/t/concurrent_insert_basic.test | |
| parent | c3eabe01fc30ee38f64b17fabfd58c6328751660 (diff) | |
| parent | e7441f0b602735e2c40b0e0e7cfb01a2443aaa5a (diff) | |
| download | mariadb-git-6c716007d13ffd74bb5c3dd7c512d4d7026a23d8.tar.gz | |
Manual merge of WL#4738 from mysql-next-mr:
- backported code that handles %f/%g arguments in
my_vsnprintf.c from 6.0
- backported %f/%g tests in unittest/mysys/my_vsnprintf-t.c
from 6.0
- replaced snprintf("%g") in sql/set_var.cc with my_gcvt()
- removed unnecessary "--replace-result"s for Windows in
mysql-test/suite/sys_vars/t/long_query_time_basic.test
- some test results adjustments
Diffstat (limited to 'mysql-test/suite/sys_vars/t/concurrent_insert_basic.test')
| -rw-r--r-- | mysql-test/suite/sys_vars/t/concurrent_insert_basic.test | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/mysql-test/suite/sys_vars/t/concurrent_insert_basic.test b/mysql-test/suite/sys_vars/t/concurrent_insert_basic.test index bc401ef22a3..5be569e52d3 100644 --- a/mysql-test/suite/sys_vars/t/concurrent_insert_basic.test +++ b/mysql-test/suite/sys_vars/t/concurrent_insert_basic.test @@ -67,35 +67,41 @@ SELECT @@global.concurrent_insert; SET @@global.concurrent_insert = 2; SELECT @@global.concurrent_insert; +SET @@global.concurrent_insert = NEVER; +SELECT @@global.concurrent_insert; +SET @@global.concurrent_insert = AUTO; +SELECT @@global.concurrent_insert; +SET @@global.concurrent_insert = ALWAYS; +SELECT @@global.concurrent_insert; + --echo '#--------------------FN_DYNVARS_018_04-------------------------#' ########################################################################### # Change the value of concurrent_insert to invalid value # ########################################################################### +--error ER_WRONG_VALUE_FOR_VAR SET @@global.concurrent_insert = -1; -Select @@global.concurrent_insert; +--error ER_WRONG_VALUE_FOR_VAR SET @@global.concurrent_insert = 100; -Select @@global.concurrent_insert; -echo 'Bug # 34837: Errors are not coming on assigning invalid values to variable'; ---Error ER_WRONG_TYPE_FOR_VAR +--Error ER_WRONG_VALUE_FOR_VAR SET @@global.concurrent_insert = TRUEF; ---Error ER_WRONG_TYPE_FOR_VAR +--Error ER_WRONG_VALUE_FOR_VAR SET @@global.concurrent_insert = TRUE_F; ---Error ER_WRONG_TYPE_FOR_VAR +--Error ER_WRONG_VALUE_FOR_VAR SET @@global.concurrent_insert = FALSE0; ---Error ER_WRONG_TYPE_FOR_VAR +--Error ER_WRONG_VALUE_FOR_VAR SET @@global.concurrent_insert = OON; ---Error ER_WRONG_TYPE_FOR_VAR +--Error ER_WRONG_VALUE_FOR_VAR SET @@global.concurrent_insert = ONN; ---Error ER_WRONG_TYPE_FOR_VAR +--Error ER_WRONG_VALUE_FOR_VAR SET @@global.concurrent_insert = OOFF; ---Error ER_WRONG_TYPE_FOR_VAR +--Error ER_WRONG_VALUE_FOR_VAR SET @@global.concurrent_insert = 0FF; ---Error ER_WRONG_TYPE_FOR_VAR +--Error ER_WRONG_VALUE_FOR_VAR SET @@global.concurrent_insert = ' '; ---Error ER_WRONG_TYPE_FOR_VAR +--Error ER_WRONG_VALUE_FOR_VAR SET @@global.concurrent_insert = " "; ---Error ER_WRONG_TYPE_FOR_VAR +--Error ER_WRONG_VALUE_FOR_VAR SET @@global.concurrent_insert = ''; @@ -125,9 +131,9 @@ WHERE VARIABLE_NAME='concurrent_insert'; # Check if ON and OFF values can be used on variable # ################################################################### ---Error ER_WRONG_TYPE_FOR_VAR +--Error ER_WRONG_VALUE_FOR_VAR SET @@global.concurrent_insert = OFF; ---Error ER_WRONG_TYPE_FOR_VAR +--Error ER_WRONG_VALUE_FOR_VAR SET @@global.concurrent_insert = ON; |