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 | c6024dfc4e09d5eed076230a8645a8f4dae0d2f8 (patch) | |
| tree | 118ad3b6cdad8674425315bda73619e5783bc743 /sql/derror.cc | |
| parent | 7e8d74505e2334db76a20360168e650149c99cc5 (diff) | |
| download | mariadb-git-c6024dfc4e09d5eed076230a8645a8f4dae0d2f8.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/derror.cc')
| -rw-r--r-- | sql/derror.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/derror.cc b/sql/derror.cc index bf8c589a65f..db9cd3c0c58 100644 --- a/sql/derror.cc +++ b/sql/derror.cc @@ -35,6 +35,8 @@ static void init_myfunc_errs(void); C_MODE_START static const char **get_server_errmsgs() { + if (!current_thd) + return DEFAULT_ERRMSGS; return CURRENT_THD_ERRMSGS; } C_MODE_END |