database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merging

Browse Source
This commit is contained in:
hf@deer.(none)
2005-08-04 16:27:53 +05:00
parent a0bd08d1b2 39ef54fd8e
commit 1311d4dc79
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libmysql/libmysql.c
View File

@ -189,6 +189,13 @@ void STDCALL mysql_server_end()
finish_client_errs(); finish_client_errs();
free_charsets(); free_charsets();
mysql_client_init= org_my_init_done= 0; mysql_client_init= org_my_init_done= 0;
#ifdef EMBEDDED_SERVER
if (stderror_file)
{
fclose(stderror_file);
stderror_file= 0;
}
#endif
} }
static MYSQL_PARAMETERS mysql_internal_parameters= static MYSQL_PARAMETERS mysql_internal_parameters=

1
sql/mysql_priv.h
View File

@ -1156,6 +1156,7 @@ extern uint opt_large_page_size;
extern MYSQL_LOG mysql_log,mysql_slow_log,mysql_bin_log; extern MYSQL_LOG mysql_log,mysql_slow_log,mysql_bin_log;
extern FILE *bootstrap_file; extern FILE *bootstrap_file;
extern int bootstrap_error; extern int bootstrap_error;
extern FILE *stderror_file;
extern pthread_key(MEM_ROOT**,THR_MALLOC); extern pthread_key(MEM_ROOT**,THR_MALLOC);
extern pthread_mutex_t LOCK_mysql_create_db,LOCK_Acl,LOCK_open, extern pthread_mutex_t LOCK_mysql_create_db,LOCK_Acl,LOCK_open,
LOCK_thread_count,LOCK_mapped_file,LOCK_user_locks, LOCK_status, LOCK_thread_count,LOCK_mapped_file,LOCK_user_locks, LOCK_status,

3
sql/mysqld.cc
View File

@ -447,6 +447,7 @@ Le_creator le_creator;
FILE *bootstrap_file; FILE *bootstrap_file;
int bootstrap_error; int bootstrap_error;
FILE *stderror_file=0;
I_List<i_string_pair> replicate_rewrite_db; I_List<i_string_pair> replicate_rewrite_db;
I_List<i_string> replicate_do_db, replicate_ignore_db; I_List<i_string> replicate_do_db, replicate_ignore_db;
@ -2878,7 +2879,7 @@ server.");
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
if (freopen(log_error_file, "a+", stdout)) if (freopen(log_error_file, "a+", stdout))
#endif #endif
freopen(log_error_file, "a+", stderr); stderror_file= freopen(log_error_file, "a+", stderr);
} }
} }