mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

branches/zip:

Browse source 
Followup to r2935: add the Windows Delay Loader stuff for the MySQL
variable that we are accessing. If someday we have another solution for
Bug#40360 Binlog related errors with binlog off
then this should also be reverted.
This commit is contained in:
vasil 2008-10-30 10:24:09 +00:00
parent c368f38f4d
commit 69977f27fe
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
handler/handler0vars.h
View file

@ -27,6 +27,7 @@ extern bool* wdl_mysqld_embedded;
extern uint* wdl_lower_case_table_names;
extern ulong* wdl_specialflag;
extern int* wdl_my_umask;
extern bool* wdl_opt_bin_log;
#define my_charset_bin (*wdl_my_charset_bin)
#define my_charset_latin1 (*wdl_my_charset_latin1)
@ -47,5 +48,6 @@ extern int* wdl_my_umask;
#define lower_case_table_names (*wdl_lower_case_table_names)
#define specialflag (*wdl_specialflag)
#define my_umask (*wdl_my_umask)
#define opt_bin_log (*wdl_opt_bin_log)
#endif

3
handler/win_delay_loader.cc
View file

@ -55,6 +55,7 @@ bool* wdl_mysqld_embedded;
uint* wdl_lower_case_table_names;
ulong* wdl_specialflag;
int* wdl_my_umask;
bool* wdl_opt_bin_log;
/***********************************************************************
The following is defined in ha_innodb.cc. It is used for copying the
@ -607,6 +608,8 @@ wdl_get_external_variables(void)
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_SYM("?opt_bin_log@@3_NA",
wdl_opt_bin_log, bool);
GET_SYM2("?system_charset_info@@3PEAUcharset_info_st@@EA",
"?system_charset_info@@3PAUcharset_info_st@@A",