diff options
| author | monty@hundin.mysql.fi <> | 2001-11-03 21:33:11 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-11-03 21:33:11 +0200 |
| commit | ccce9d031fa2305a8b108cc49c7a628e7279c8b8 (patch) | |
| tree | a20ca6b4d7423d135752caf32d8b09358147421e /libmysqld/lib_sql.cc | |
| parent | abb7df2de126c96f6c8e7525f83a9fb1ac97f208 (diff) | |
| download | mariadb-git-ccce9d031fa2305a8b108cc49c7a628e7279c8b8.tar.gz | |
Added STDCALL to mysql_sever and mysql_thread variables
Merged error messages with 3.23.44
Fixed bug with DATA DIRECTORY on windows
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 139f9b9c0c7..d241ceaada0 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -296,7 +296,7 @@ extern "C" static my_bool inited, org_my_init_done; -int mysql_server_init(int argc, char **argv, char **groups) +int STDCALL mysql_server_init(int argc, char **argv, char **groups) { char glob_hostname[FN_REFLEN]; @@ -561,7 +561,7 @@ int mysql_server_init(int argc, char **argv, char **groups) } -void mysql_server_end() +void STDCALL mysql_server_end() { clean_up(0); #ifdef THREAD @@ -571,7 +571,7 @@ void mysql_server_end() #endif } -my_bool mysql_thread_init() +my_bool STDCALL mysql_thread_init() { #ifdef THREAD return my_thread_init(); @@ -580,7 +580,7 @@ my_bool mysql_thread_init() #endif } -void mysql_thread_end() +void STDCALL mysql_thread_end() { #ifdef THREAD my_thread_end(); |