Commit 9b11f7d8 authored by calvin's avatar calvin

branches/zip: ignore the failure when builtin_innobase_plugin is not

available.

External variable builtin_innobase_plugin is not available when mysqld
does not have a builtin InnoDB. The init of the Windows plugin should
not fail in this case. 

Approved by:	Marko (on IM)
parent 5b4736c6
...@@ -605,8 +605,6 @@ wdl_get_external_variables(void) ...@@ -605,8 +605,6 @@ wdl_get_external_variables(void)
GET_SYM("?lower_case_table_names@@3IA", GET_SYM("?lower_case_table_names@@3IA",
wdl_lower_case_table_names, uint); wdl_lower_case_table_names, uint);
GET_SYM("?specialflag@@3KA", wdl_specialflag, ulong); GET_SYM("?specialflag@@3KA", wdl_specialflag, ulong);
GET_SYM("?builtin_innobase_plugin@@3PAUst_mysql_plugin@@A",
builtin_innobase_plugin_ptr, struct st_mysql_plugin);
GET_SYM2("?system_charset_info@@3PEAUcharset_info_st@@EA", GET_SYM2("?system_charset_info@@3PEAUcharset_info_st@@EA",
"?system_charset_info@@3PAUcharset_info_st@@A", "?system_charset_info@@3PAUcharset_info_st@@A",
...@@ -621,6 +619,12 @@ wdl_get_external_variables(void) ...@@ -621,6 +619,12 @@ wdl_get_external_variables(void)
"?binlog_format_names@@3PAPBDA", "?binlog_format_names@@3PAPBDA",
wdl_binlog_format_names, char*); wdl_binlog_format_names, char*);
/* It is fine if builtin_innobase_plugin is not available. */
builtin_innobase_plugin_ptr = (struct st_mysql_plugin*)
wdl_get_varaddr_from_map(
hmod,
"?builtin_innobase_plugin@@3PAUst_mysql_plugin@@A");
#ifndef DBUG_OFF #ifndef DBUG_OFF
GET_PROC_ADDR(_db_enter_); GET_PROC_ADDR(_db_enter_);
GET_PROC_ADDR(_db_return_); GET_PROC_ADDR(_db_return_);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment