diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-11-13 13:09:59 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-11-13 13:09:59 +0400 |
| commit | b88cfbad684ed57b058a3e6b63d458516b41db85 (patch) | |
| tree | 64e928dcd500f0ca2361229714c5e70e64d1678f /libmysqld/lib_sql.cc | |
| parent | 5f5696b65a7526ab014d5fe9eba907db2c739c11 (diff) | |
| download | mariadb-git-b88cfbad684ed57b058a3e6b63d458516b41db85.tar.gz | |
Bug #31868 mysql_server_init crash when language path is not correctly set.
When mysql_server_init() interrupts on some error (wrong errmsg file
for example) in the middle of it's execution, it doesn't call
execute_ddl_log_recovery() so LOCK_gdl mutex isn't init-ed.
In this case we shouldn't execute release_ddl_log during cleanup
as it uses that mutex inside.
BitKeeper/etc/ignore:
Added libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc libmysql_r/client_settings.h to the ignore list
libmysqld/lib_sql.cc:
Bug #31868 mysql_server_init crash when language path is not correctly set.
line moved to clean_up()
sql/mysqld.cc:
Bug #31868 mysql_server_init crash when language path is not correctly set.
release_ddl_log() now can be called from common 'clean_up()'
sql/sql_table.cc:
Bug #31868 mysql_server_init crash when language path is not correctly set.
do_release flag added to the global_ddl_log and the construcntor to
set it's initial value.
Also now release_ddl_log() checks for that flag.
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 4e525f8447f..e9c54a3bd5c 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -551,7 +551,6 @@ void end_embedded_server() { my_free((char*) copy_arguments_ptr, MYF(MY_ALLOW_ZERO_PTR)); copy_arguments_ptr=0; - release_ddl_log(); clean_up(0); } |