branches/zip:

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.

handler/handler0vars.h

@@ -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

handler/win_delay_loader.cc

@@ -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",