diff options
| author | Sergey Glukhov <gluh@mysql.com> | 2009-02-09 19:03:52 +0400 |
|---|---|---|
| committer | Sergey Glukhov <gluh@mysql.com> | 2009-02-09 19:03:52 +0400 |
| commit | 4d0557a2e6e2f79e3662d3f10ea17656cf69ca12 (patch) | |
| tree | e1a70de16466fc1105587d75908a1b3c3811044c /sql/set_var.cc | |
| parent | 461cad77b4e068ecc2534150170a029e6f425407 (diff) | |
| download | mariadb-git-4d0557a2e6e2f79e3662d3f10ea17656cf69ca12.tar.gz | |
Bug#42610 Dynamic plugin broken in 5.1.31
added ignore-builtin-innodb option which disabled
initialization of builtin InnoDB plugin
mysql-test/r/innodb_ignore_builtin.result:
test case
mysql-test/t/innodb_ignore_builtin-master.opt:
test case
mysql-test/t/innodb_ignore_builtin.test:
test case
sql/mysql_priv.h:
added ignore-builtin-innodb option which disabled
initialization of builtin InnoDB plugin
sql/mysqld.cc:
added ignore-builtin-innodb option which disabled
initialization of builtin InnoDB plugin
sql/set_var.cc:
added ignore-builtin-innodb option which disabled
initialization of builtin InnoDB plugin
sql/sql_plugin.cc:
added ignore-builtin-innodb option which disabled
initialization of builtin InnoDB plugin
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 07e1528d483..f14068fcfcb 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -275,6 +275,11 @@ static sys_var_const sys_ft_query_expansion_limit(&vars, static sys_var_const sys_ft_stopword_file(&vars, "ft_stopword_file", OPT_GLOBAL, SHOW_CHAR_PTR, (uchar*) &ft_stopword_file); + +static sys_var_const sys_ignore_builtin_innodb(&vars, "ignore_builtin_innodb", + OPT_GLOBAL, SHOW_BOOL, + (uchar*) &opt_ignore_builtin_innodb); + sys_var_str sys_init_connect(&vars, "init_connect", 0, sys_update_init_connect, sys_default_init_connect,0); |