diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/errmsg.h | 3 | ||||
| -rw-r--r-- | include/my_global.h | 6 | ||||
| -rw-r--r-- | include/mysql.h | 3 | ||||
| -rw-r--r-- | include/mysqld_error.h | 2 | ||||
| -rw-r--r-- | include/sql_state.h | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/include/errmsg.h b/include/errmsg.h index 24326b1efef..8f3ddfa9796 100644 --- a/include/errmsg.h +++ b/include/errmsg.h @@ -86,5 +86,4 @@ extern const char *client_errors[]; /* Error messages */ #define CR_SHARED_MEMORY_CONNECT_SET_ERROR 2045 #define CR_CONN_UNKNOW_PROTOCOL 2046 #define CR_INVALID_CONN_HANDLE 2047 -#define CR_MYSQL_SERVER_INIT_MISSED 2048 -#define CR_SECURE_AUTH 2049 +#define CR_SECURE_AUTH 2048 diff --git a/include/my_global.h b/include/my_global.h index 9529cbee62c..32516cd5810 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1162,4 +1162,10 @@ typedef union { #endif #endif +#ifdef HAVE_CHARSET_utf8 +#define MYSQL_UNIVERSAL_CLIENT_CHARSET "utf8" +#else +#define MYSQL_UNIVERSAL_CLIENT_CHARSET MYSQL_DEFAULT_CHARSET_NAME +#endif + #endif /* my_global_h */ diff --git a/include/mysql.h b/include/mysql.h index 8f3bc9aaf2f..d1b467f9649 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -638,9 +638,6 @@ int STDCALL mysql_drop_db(MYSQL *mysql, const char *DB); (*(mysql)->methods->advanced_command)(mysql, command, \ NullS, 0, arg, length, skip_check) unsigned long net_safe_read(MYSQL* mysql); -int mysql_once_init(void); - -extern my_bool server_inited; #ifdef __NETWARE__ #pragma pack(pop) /* restore alignment */ diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 40169cf73c6..6a484d0419c 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -301,6 +301,6 @@ #define ER_BAD_FT_COLUMN 1282 #define ER_UNKNOWN_KEY_CACHE 1283 #define ER_WARN_HOSTNAME_WONT_WORK 1284 -#define ER_UNKNOWN_TABLE_ENGINE 1285 +#define ER_UNKNOWN_STORAGE_ENGINE 1285 #define ER_WARN_DEPRECATED_SYNTAX 1286 #define ER_ERROR_MESSAGES 287 diff --git a/include/sql_state.h b/include/sql_state.h index ad62ddeb670..5c4b1c50745 100644 --- a/include/sql_state.h +++ b/include/sql_state.h @@ -161,4 +161,4 @@ ER_WARN_DATA_OUT_OF_RANGE, "01000", "", ER_WARN_DATA_TRUNCATED, "01000", "", ER_WRONG_NAME_FOR_INDEX, "42000", "", ER_WRONG_NAME_FOR_CATALOG, "42000", "", -ER_UNKNOWN_TABLE_ENGINE, "42000", "", +ER_UNKNOWN_STORAGE_ENGINE, "42000", "", |