diff options
| author | unknown <elliot@mysql.com> | 2006-04-21 21:04:43 -0400 |
|---|---|---|
| committer | unknown <elliot@mysql.com> | 2006-04-21 21:04:43 -0400 |
| commit | 1032be522b3a7619eb42525349aed9490b5ccc8e (patch) | |
| tree | 61b5caacac20c7ef142aabd76b9c984c68b94da1 /sql/mysqld.cc | |
| parent | 11b49c9b506eaccd3926d2ae88fab14b74b2a79c (diff) | |
| parent | a52bd573de515c2c0f4c40311f4201e183275713 (diff) | |
| download | mariadb-git-1032be522b3a7619eb42525349aed9490b5ccc8e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge
sql/handler.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 357e9cb7a1d..fd640fb153c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3605,6 +3605,7 @@ we force server id to 2, but this MySQL server will not act as a slave."); unireg_abort(1); } } + execute_ddl_log_recovery(); create_shutdown_thread(); create_maintenance_thread(); @@ -3656,6 +3657,7 @@ we force server id to 2, but this MySQL server will not act as a slave."); pthread_cond_wait(&COND_thread_count,&LOCK_thread_count); (void) pthread_mutex_unlock(&LOCK_thread_count); + release_ddl_log(); #if defined(__WIN__) && !defined(EMBEDDED_LIBRARY) if (Service.IsNT() && start_mode) Service.Stop(); |