1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows : Fix server compile errors when compile with /Zc:strictStrings option

Browse Source
This commit is contained in:
Vladislav Vaintroub 2017-02-28 12:57:33 +00:00
parent fc673a2c12
commit d4baeca441
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysqlbinlog.cc
View File

@ -106,7 +106,7 @@ static const char* sock= 0;
static char *opt_plugindir= 0, *opt_default_auth= 0; static char *opt_plugindir= 0, *opt_default_auth= 0;
#ifdef HAVE_SMEM #ifdef HAVE_SMEM
static char *shared_memory_base_name= 0; static const char *shared_memory_base_name= 0;
#endif #endif
static char* user = 0; static char* user = 0;
static char* pass = 0; static char* pass = 0;

7
include/my_global.h
View File

@ -1078,10 +1078,9 @@ typedef ulong myf; /* Type of MyFlags in my_funcs */
static inline char *dlerror(void) static inline char *dlerror(void)
{ {
static char win_errormsg[2048]; static char win_errormsg[2048];
if(FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
0, GetLastError(), 0, win_errormsg, 2048, NULL)) 0, GetLastError(), 0, win_errormsg, 2048, NULL);
return win_errormsg; return win_errormsg;
return "";
} }
#define HAVE_DLOPEN 1 #define HAVE_DLOPEN 1
#define HAVE_DLERROR 1 #define HAVE_DLERROR 1

4
sql/mysql_install_db.cc
View File

@ -386,8 +386,8 @@ static int register_service()
CloseServiceHandle(sc_manager); CloseServiceHandle(sc_manager);
die("CreateService failed (%u)", GetLastError()); die("CreateService failed (%u)", GetLastError());
} }
char description[] = "MariaDB database server";
SERVICE_DESCRIPTION sd= { "MariaDB database server" }; SERVICE_DESCRIPTION sd= { description };
ChangeServiceConfig2(sc_service, SERVICE_CONFIG_DESCRIPTION, &sd); ChangeServiceConfig2(sc_service, SERVICE_CONFIG_DESCRIPTION, &sd);
CloseServiceHandle(sc_service); CloseServiceHandle(sc_service);
CloseServiceHandle(sc_manager); CloseServiceHandle(sc_manager);

2
sql/mysqld.cc
View File

@ -1414,7 +1414,7 @@ ulong query_cache_min_res_unit= QUERY_CACHE_MIN_RESULT_DATA_SIZE;
Query_cache query_cache; Query_cache query_cache;
#endif #endif
#ifdef HAVE_SMEM #ifdef HAVE_SMEM
char *shared_memory_base_name= default_shared_memory_base_name; const char *shared_memory_base_name= default_shared_memory_base_name;
my_bool opt_enable_shared_memory; my_bool opt_enable_shared_memory;
HANDLE smem_event_connect_request= 0; HANDLE smem_event_connect_request= 0;
#endif #endif

3
sql/mysqld.h
View File

@ -118,7 +118,8 @@ extern my_bool sp_automatic_privileges, opt_noacl;
extern ulong use_stat_tables; extern ulong use_stat_tables;
extern my_bool opt_old_style_user_limits, trust_function_creators; extern my_bool opt_old_style_user_limits, trust_function_creators;
extern uint opt_crash_binlog_innodb; extern uint opt_crash_binlog_innodb;
extern char *shared_memory_base_name, *mysqld_unix_port; extern const char *shared_memory_base_name;
extern char *mysqld_unix_port;
extern my_bool opt_enable_shared_memory; extern my_bool opt_enable_shared_memory;
extern ulong opt_replicate_events_marked_for_skip; extern ulong opt_replicate_events_marked_for_skip;
extern char *default_tz_name; extern char *default_tz_name;

2
sql/nt_servc.cc
View File

@ -508,7 +508,7 @@ BOOL NTService::IsService(LPCSTR ServiceName)
} }
/* ------------------------------------------------------------------------ /* ------------------------------------------------------------------------
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
BOOL NTService::got_service_option(char **argv, char *service_option) BOOL NTService::got_service_option(char **argv, const char *service_option)
{ {
char *option; char *option;
for (option= argv[1]; *option; option++) for (option= argv[1]; *option; option++)

2
sql/nt_servc.h
View File

@ -61,7 +61,7 @@ class NTService
BOOL SeekStatus(LPCSTR szInternName, int OperationType); BOOL SeekStatus(LPCSTR szInternName, int OperationType);
BOOL Remove(LPCSTR szInternName); BOOL Remove(LPCSTR szInternName);
BOOL IsService(LPCSTR ServiceName); BOOL IsService(LPCSTR ServiceName);
BOOL got_service_option(char **argv, char *service_option); BOOL got_service_option(char **argv, const char *service_option);
BOOL is_super_user(); BOOL is_super_user();
/* /*