diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-07 11:45:06 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-07 11:45:06 +0200 |
| commit | 64dc734dee09157bf0c4c9bd84ba6b16754e27e1 (patch) | |
| tree | abb09346d74f5eb8cf867ea184e544bab1f41331 /mysys/my_init.c | |
| parent | ef62b4c948d68108c0945ebde33540b03b392a6d (diff) | |
| download | mariadb-git-64dc734dee09157bf0c4c9bd84ba6b16754e27e1.tar.gz | |
Fixed that derived tables are properly droped
mysys/my_init.c:
Move my_once_free() up to not get warnings for this from safemalloc.
sql/item_row.cc:
Removed compiler warnings
sql/sql_select.cc:
split fix_tables_pointer() into two functions to be able to reuse code
sql/sql_select.h:
split fix_tables_pointer() into two functions to be able to reuse code
Diffstat (limited to 'mysys/my_init.c')
| -rw-r--r-- | mysys/my_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index 2f5088d5b9e..ae7f78b7445 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -121,6 +121,7 @@ void my_end(int infoflag) } } free_charsets(); + my_once_free(); if (infoflag & MY_GIVE_INFO || info_file != stderr) { #ifdef HAVE_GETRUSAGE @@ -163,7 +164,6 @@ Voluntary context switches %ld, Involuntary context switches %ld\n", pthread_mutex_destroy(&THR_LOCK_malloc); pthread_mutex_destroy(&THR_LOCK_open); DBUG_POP(); /* Must be done before my_thread_end */ - my_once_free(); my_thread_end(); my_thread_global_end(); #endif |