diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2013-08-06 14:02:07 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2013-08-06 14:02:07 +0400 |
| commit | 5997156b9b5381c5dba9f782fec2a7347689a831 (patch) | |
| tree | a8edffde9446fa8d8cd173d646d09ace3fcdb65f /mysql-test | |
| parent | 9d1f31fb4b9f4822146ddab626a470f085ec866f (diff) | |
| download | mariadb-git-5997156b9b5381c5dba9f782fec2a7347689a831.tar.gz | |
MDEV-4801 - Server crashes in my_strdup on setting
innodb_ft_user_stopword_table to DEFAULT
Setting plugin string variable with PLUGIN_VAR_MEMALLOC flag
to NULL causes server crash.
mysql-test/suite/sys_vars/r/innodb_ft_user_stopword_table_basic.result:
Reset innodb_ft_user_stopword_table. Also tests MDEV-4801.
mysql-test/suite/sys_vars/t/innodb_ft_user_stopword_table_basic.test:
Reset innodb_ft_user_stopword_table. Also tests MDEV-4801.
sql/sql_plugin.cc:
When we got NULL value, do not strdup(NULL).
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/innodb_ft_user_stopword_table_basic.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/t/innodb_ft_user_stopword_table_basic.test | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/sys_vars/r/innodb_ft_user_stopword_table_basic.result b/mysql-test/suite/sys_vars/r/innodb_ft_user_stopword_table_basic.result index 73d665da530..66298481693 100644 --- a/mysql-test/suite/sys_vars/r/innodb_ft_user_stopword_table_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_ft_user_stopword_table_basic.result @@ -27,3 +27,4 @@ set global innodb_ft_user_stopword_table=1e1; ERROR 42000: Incorrect argument type to variable 'innodb_ft_user_stopword_table' set global innodb_ft_user_stopword_table='Salmon'; ERROR 42000: Variable 'innodb_ft_user_stopword_table' can't be set to the value of 'Salmon' +SET @@session.innodb_ft_user_stopword_table=@start_global_value; diff --git a/mysql-test/suite/sys_vars/t/innodb_ft_user_stopword_table_basic.test b/mysql-test/suite/sys_vars/t/innodb_ft_user_stopword_table_basic.test index 3e872404706..159e570b3ce 100644 --- a/mysql-test/suite/sys_vars/t/innodb_ft_user_stopword_table_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_ft_user_stopword_table_basic.test @@ -35,3 +35,4 @@ set global innodb_ft_user_stopword_table=1e1; --error ER_WRONG_VALUE_FOR_VAR set global innodb_ft_user_stopword_table='Salmon'; +SET @@session.innodb_ft_user_stopword_table=@start_global_value; |