diff options
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 2853baf2dfe..d2de6c103dd 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -538,6 +538,11 @@ int init_embedded_server(int argc, char **argv, char **groups) sql_print_error("Warning: Can't create thread to manage maintenance"); } + // FIXME initialize binlog_filter and rpl_filter if not already done + // corresponding delete is in clean_up() + if(!binlog_filter) binlog_filter = new Rpl_filter; + if(!rpl_filter) rpl_filter = new Rpl_filter; + if (opt_init_file) { if (read_init_file(opt_init_file)) @@ -593,7 +598,7 @@ void *create_embedded_thd(int client_flag) thd->set_time(); thd->init_for_queries(); thd->client_capabilities= client_flag; - thd->real_id= (pthread_t) thd; + thd->real_id= pthread_self(); thd->db= NULL; thd->db_length= 0; |