diff options
| author | monty@mashka.mysql.fi <> | 2003-01-07 11:45:50 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-01-07 11:45:50 +0200 |
| commit | 6b937028544ddd8274548e6db215f9d65a07589a (patch) | |
| tree | 079ee0195d406e663e5e3cf06dc4878b1167aa77 /mysys | |
| parent | cec5601e5269112afb180beaea260bddd253a92e (diff) | |
| parent | 22aaac013b2d714e7a4329eab9a5cc880d792b6c (diff) | |
| download | mariadb-git-6b937028544ddd8274548e6db215f9d65a07589a.tar.gz | |
Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
Diffstat (limited to 'mysys')
| -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 |