diff options
author | sasha@mysql.sashanet.com <> | 2001-08-11 17:28:41 -0600 |
---|---|---|
committer | sasha@mysql.sashanet.com <> | 2001-08-11 17:28:41 -0600 |
commit | 72671338869b105063ff6372799ee6c6c7679988 (patch) | |
tree | 68a7e089d65a9c4434527dfc1e58ba2f98a15a88 /include | |
parent | 89ac8682ddc5f130a1ef50deb655c4d9bdbe3372 (diff) | |
parent | 5b7da4267e306af39aa0291a8e0d5685e9ed44cf (diff) | |
download | mariadb-git-72671338869b105063ff6372799ee6c6c7679988.tar.gz |
merged
Diffstat (limited to 'include')
-rw-r--r-- | include/mysql_com.h | 2 | ||||
-rw-r--r-- | include/mysqld_error.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 67a483705ee..2d1c5017922 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -226,6 +226,8 @@ void hash_password(unsigned long *result, const char *password); void my_init(void); void load_defaults(const char *conf_file, const char **groups, int *argc, char ***argv); +my_bool my_thread_init(void); +void my_thread_end(void); #ifdef __cplusplus } diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 52f4261c22b..d8b38d96e18 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -216,4 +216,5 @@ #define ER_ERROR_WHEN_EXECUTING_COMMAND 1213 #define ER_WRONG_USAGE 1214 #define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1215 -#define ER_ERROR_MESSAGES 216 +#define ER_NO_PERSMISSION_TO_CREATE_USER 1216 +#define ER_ERROR_MESSAGES 217 |