diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-03 21:33:11 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-03 21:33:11 +0200 |
| commit | 7edaaf34e6b6ddd4d86fccae1755c40027dc86fc (patch) | |
| tree | a20ca6b4d7423d135752caf32d8b09358147421e /libmysqld | |
| parent | 29d82b3bcceca18d62b688e605fa7d252cae37fa (diff) | |
| download | mariadb-git-7edaaf34e6b6ddd4d86fccae1755c40027dc86fc.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
Docs/internals.texi:
Update coding policies
Docs/manual.texi:
Minor general corrections
acinclude.m4:
Fixed wrong cpu-test
configure.in:
Remove CPU test, because this makes unportable binaries.
include/mysql.h:
Added STDCALL to mysql_sever and mysql_thread variables
include/mysqld_error.h:
Merged error messages with 3.23.44
libmysql/libmysql.c:
Added STDCALL to mysql_sever and mysql_thread variables
libmysqld/lib_sql.cc:
Added STDCALL to mysql_sever and mysql_thread variables
sql-bench/limits/db2.cfg:
New limits file
sql-bench/test-select.sh:
Fixed bug in cache test
sql/share/czech/errmsg.txt:
Merged error messages with 3.23.44
sql/share/danish/errmsg.txt:
Merged error messages with 3.23.44
sql/share/dutch/errmsg.txt:
Merged error messages with 3.23.44
sql/share/english/errmsg.txt:
Merged error messages with 3.23.44
sql/share/estonian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/french/errmsg.txt:
Merged error messages with 3.23.44
sql/share/german/errmsg.txt:
Merged error messages with 3.23.44
sql/share/greek/errmsg.txt:
Merged error messages with 3.23.44
sql/share/hungarian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/italian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/japanese/errmsg.txt:
Merged error messages with 3.23.44
sql/share/korean/errmsg.txt:
Merged error messages with 3.23.44
sql/share/norwegian-ny/errmsg.txt:
Merged error messages with 3.23.44
sql/share/norwegian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/polish/errmsg.txt:
Merged error messages with 3.23.44
sql/share/portuguese/errmsg.txt:
Merged error messages with 3.23.44
sql/share/romanian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/russian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/slovak/errmsg.txt:
Merged error messages with 3.23.44
sql/share/spanish/errmsg.txt:
Merged error messages with 3.23.44
sql/share/swedish/errmsg.txt:
Merged error messages with 3.23.44
sql/share/ukrainian/errmsg.txt:
Merged error messages with 3.23.44
sql/sql_parse.cc:
Fix bug with DATA DIRECTORY on windows.
sql/sql_select.cc:
Cleanup
Diffstat (limited to 'libmysqld')
| -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(); |