diff options
| author | Magne Mahre <magne.mahre@oracle.com> | 2011-03-01 14:36:47 +0100 |
|---|---|---|
| committer | Magne Mahre <magne.mahre@oracle.com> | 2011-03-01 14:36:47 +0100 |
| commit | a4481d32220ad283c50e9a95e56b9bafe13b592c (patch) | |
| tree | 5cb7170f546a09c4e3f62809bd756cdd58255145 /mysys | |
| parent | 14263b222a9ab2f0769dcc5c6f2b0825dc7163b1 (diff) | |
| download | mariadb-git-a4481d32220ad283c50e9a95e56b9bafe13b592c.tar.gz | |
Post-push cleanup, for Bug#11763065 et al.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_init.c | 14 | ||||
| -rw-r--r-- | mysys/my_thr_init.c | 5 |
2 files changed, 5 insertions, 14 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index 5534dc07209..4963ce9b577 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -55,17 +55,13 @@ MYSQL_FILE *mysql_stdin= NULL; static MYSQL_FILE instrumented_stdin; -/* - Init my_sys functions and my_sys variabels - - SYNOPSIS - my_init() +/** + Initialize my_sys functions, resources and variables - RETURN - 0 ok - 1 Couldn't initialize environment + @return Initialization result + @retval 0 Success + @retval 1 Error. Couldn't initialize environment */ - my_bool my_init(void) { char *str; diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c index 1482ff28975..28f6412ed5b 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.c @@ -231,11 +231,6 @@ my_bool my_thread_global_init(void) install_sigabrt_handler(); #endif -// if (my_thread_init()) -// { -// my_thread_global_end(); /* Clean up */ -// return 1; -// } return 0; } |