mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
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
This commit is contained in:
@@ -253,15 +253,15 @@ typedef struct st_mysql_manager
|
||||
/* Set up and bring down the server; to ensure that applications will
|
||||
* work when linked against either the standard client library or the
|
||||
* embedded server library, these functions should be called. */
|
||||
int mysql_server_init(int argc, char **argv, char **groups);
|
||||
void mysql_server_end(void);
|
||||
int STDCALL mysql_server_init(int argc, char **argv, char **groups);
|
||||
void STDCALL mysql_server_end(void);
|
||||
|
||||
/* Set up and bring down a thread; these function should be called
|
||||
* for each thread in an application which opens at least one MySQL
|
||||
* connection. All uses of the connection(s) should be between these
|
||||
* function calls. */
|
||||
my_bool mysql_thread_init(void);
|
||||
void mysql_thread_end(void);
|
||||
my_bool STDCALL mysql_thread_init(void);
|
||||
void STDCALL mysql_thread_end(void);
|
||||
|
||||
/* Functions to get information from the MYSQL and MYSQL_RES structures */
|
||||
/* Should definitely be used if one uses shared libraries */
|
||||
@@ -414,8 +414,8 @@ MYSQL * STDCALL mysql_connect(MYSQL *mysql, const char *host,
|
||||
int STDCALL mysql_create_db(MYSQL *mysql, const char *DB);
|
||||
int STDCALL mysql_drop_db(MYSQL *mysql, const char *DB);
|
||||
#define mysql_reload(mysql) mysql_refresh((mysql),REFRESH_GRANT)
|
||||
#define HAVE_MYSQL_REAL_CONNECT
|
||||
#endif
|
||||
#define HAVE_MYSQL_REAL_CONNECT
|
||||
|
||||
/*
|
||||
The following functions are mainly exported because of mysqlbinlog;
|
||||
|
Reference in New Issue
Block a user