diff options
| author | unknown <monty@mysql.com> | 2003-12-11 06:24:32 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-12-11 06:24:32 +0200 |
| commit | 28b1f63aa7f6ed40d68c932cfe33420c12c7347d (patch) | |
| tree | 35f5e63ae1da09573a4496dfd0ced99b9d70ae97 /include/mysql_com.h | |
| parent | 7cfbc5e9336099d4b850e6a7e8282ade3e7aef19 (diff) | |
| parent | 287661e66cc1fea6730b357bb56d48c6d065ef43 (diff) | |
| download | mariadb-git-28b1f63aa7f6ed40d68c932cfe33420c12c7347d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/my/mysql-4.0
mysys/my_thr_init.c:
Auto merged
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index a874034ba46..e183a0ed423 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -241,7 +241,7 @@ void hash_password(unsigned long *result, const char *password); /* Some other useful functions */ -void my_init(void); +my_bool my_init(void); int load_defaults(const char *conf_file, const char **groups, int *argc, char ***argv); my_bool my_thread_init(void); |