diff options
| author | Alexey Botchkov <holyfoot@mysql.com> | 2010-09-02 23:37:04 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@mysql.com> | 2010-09-02 23:37:04 +0500 |
| commit | 3886c3a46dbad96e7374c71380126699dca89e54 (patch) | |
| tree | 118ad3b6cdad8674425315bda73619e5783bc743 /sql/sys_vars.h | |
| parent | b9e063ca31aebb7db1a6b87d16542bbef9065f67 (diff) | |
| download | mariadb-git-3886c3a46dbad96e7374c71380126699dca89e54.tar.gz | |
Bug#53251 mysql_library_init fails on second execution with embedded library
thread-specific variables weren't set when we load error message files.
per-file comments:
libmysqld/lib_sql.cc
Bug#53251 mysql_library_init fails on second execution with embedded library
we need to call my_thread_init() once more. Normally it's called at the my_init()
stage but that doesn't happen on the second my_init() call.
sql/derror.cc
Bug#53251 mysql_library_init fails on second execution with embedded library
use default errors for the embedded server.
sql/mysqld.cc
Bug#53251 mysql_library_init fails on second execution with embedded library
unregister server errors in clean_up(). Without it the error list contains
that on the second mysql_server_init() which is not good.
sql/set_var.cc
Bug#53251 mysql_library_init fails on second execution with embedded library
sys_var::cleanup() call instead of the destructor
sql/set_var.h
Bug#53251 mysql_library_init fails on second execution with embedded library
sys_var::cleanup() introduced instead of the destructor
sql/sys_vars.h
Bug#53251 mysql_library_init fails on second execution with embedded library
Sys_var_charptr::cleanup() implemented
Diffstat (limited to 'sql/sys_vars.h')
| -rw-r--r-- | sql/sys_vars.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sys_vars.h b/sql/sys_vars.h index ee6b429b04a..740c4f03e3e 100644 --- a/sql/sys_vars.h +++ b/sql/sys_vars.h @@ -385,7 +385,7 @@ public: DBUG_ASSERT(scope() == GLOBAL); DBUG_ASSERT(size == sizeof(char *)); } - ~Sys_var_charptr() + void cleanup() { if (flags & ALLOCATED) my_free(global_var(char*)); |