diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 10 | ||||
| -rw-r--r-- | include/mysqld_error.h | 23 |
2 files changed, 18 insertions, 15 deletions
diff --git a/include/mysql.h b/include/mysql.h index 5158fef6045..34b73bd5a7c 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -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; diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 5ac14c1155b..5fe8d6f5642 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -214,13 +214,16 @@ #define ER_NO_PERMISSION_TO_CREATE_USER 1211 #define ER_UNION_TABLES_IN_DIFFERENT_DIR 1212 #define ER_LOCK_DEADLOCK 1213 -#define ER_CONNECT_TO_MASTER 1214 -#define ER_QUERY_ON_MASTER 1215 -#define ER_ERROR_WHEN_EXECUTING_COMMAND 1216 -#define ER_WRONG_USAGE 1217 -#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1218 -#define ER_CANT_UPDATE_WITH_READLOCK 1219 -#define ER_MIXING_NOT_ALLOWED 1220 -#define ER_DUP_ARGUMENT 1221 -#define ER_TABLE_CANT_HANDLE_FULLTEXT 1222 -#define ER_ERROR_MESSAGES 223 +#define ER_TABLE_CANT_HANDLE_FULLTEXT 1214 +#define ER_CANNOT_ADD_FOREIGN 1215 +#define ER_NO_REFERENCED_ROW 1216 +#define ER_ROW_IS_REFERENCED 1217 +#define ER_CONNECT_TO_MASTER 1218 +#define ER_QUERY_ON_MASTER 1219 +#define ER_ERROR_WHEN_EXECUTING_COMMAND 1220 +#define ER_WRONG_USAGE 1221 +#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1222 +#define ER_CANT_UPDATE_WITH_READLOCK 1223 +#define ER_MIXING_NOT_ALLOWED 1224 +#define ER_DUP_ARGUMENT 1225 +#define ER_ERROR_MESSAGES 226 |