diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-11-14 15:49:57 +0400 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-11-14 15:49:57 +0400 |
| commit | 540228dc5bf8e6e163bd2acdaa6bd732be8d5f5f (patch) | |
| tree | 636ed138297965acac86ed067b64c5d4953a86bf /mysql-test | |
| parent | d77cc62d7e0cbf49ce1c9340801f7cea8a90fe6d (diff) | |
| parent | f057bbdc26b5e40cae043d31ae2344014d095490 (diff) | |
| download | mariadb-git-540228dc5bf8e6e163bd2acdaa6bd732be8d5f5f.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.1-opt-32034
into gleb.loc:/home/uchum/work/bk/5.1-opt
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/plugin.result | 10 | ||||
| -rw-r--r-- | mysql-test/t/plugin.test | 15 |
2 files changed, 25 insertions, 0 deletions
diff --git a/mysql-test/r/plugin.result b/mysql-test/r/plugin.result index 8628acecf55..e4af1535775 100644 --- a/mysql-test/r/plugin.result +++ b/mysql-test/r/plugin.result @@ -17,3 +17,13 @@ UNINSTALL PLUGIN EXAMPLE; ERROR 42000: PLUGIN EXAMPLE does not exist UNINSTALL PLUGIN non_exist; ERROR 42000: PLUGIN non_exist does not exist +# +# Bug#32034: check_func_enum() does not check correct values but set it +# to impossible int val +# +INSTALL PLUGIN example SONAME 'ha_example.so'; +SET GLOBAL example_enum_var= e1; +SET GLOBAL example_enum_var= e2; +SET GLOBAL example_enum_var= impossible; +ERROR 42000: Variable 'enum_var' can't be set to the value of 'impossible' +UNINSTALL PLUGIN example; diff --git a/mysql-test/t/plugin.test b/mysql-test/t/plugin.test index fb6d5febe45..d8d6d069676 100644 --- a/mysql-test/t/plugin.test +++ b/mysql-test/t/plugin.test @@ -24,3 +24,18 @@ UNINSTALL PLUGIN EXAMPLE; --error 1305 UNINSTALL PLUGIN non_exist; + + +--echo # +--echo # Bug#32034: check_func_enum() does not check correct values but set it +--echo # to impossible int val +--echo # + +INSTALL PLUGIN example SONAME 'ha_example.so'; + +SET GLOBAL example_enum_var= e1; +SET GLOBAL example_enum_var= e2; +--error 1231 +SET GLOBAL example_enum_var= impossible; + +UNINSTALL PLUGIN example; |