diff options
| author | monty@narttu.mysql.fi <> | 2003-08-29 13:44:35 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-08-29 13:44:35 +0300 |
| commit | 77a70a0a24ce658a3ee55248cb2e76f84afc1b88 (patch) | |
| tree | aeb2314adbd714c7e2b032209bfd7914e3cfda3d /include/mysql_com.h | |
| parent | 6cad89775b4ed78c02c2fa9f3e49181f63b7fb65 (diff) | |
| parent | 5e04e2370f05bc42437f8be476eba9e204888b65 (diff) | |
| download | mariadb-git-77a70a0a24ce658a3ee55248cb2e76f84afc1b88.tar.gz | |
merge with 4.0.15
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index b1c94e5c735..368529b1268 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -332,8 +332,8 @@ const char *mysql_errno_to_sqlstate(unsigned int mysql_errno); /* Some other useful functions */ void my_init(void); -void load_defaults(const char *conf_file, const char **groups, - int *argc, char ***argv); +int load_defaults(const char *conf_file, const char **groups, + int *argc, char ***argv); my_bool my_thread_init(void); void my_thread_end(void); |