Commit 4c13b4f0 authored by unknown's avatar unknown
Browse files

Merging 


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/mysql_priv.h:
  merging
sql/mysqld.cc:
  merging
parents 042fc752 36a2a092

libmysql/libmysql.c

+7 −0
Original line number Diff line number Diff line
@@ -189,6 +189,13 @@ void STDCALL mysql_server_end() 
  finish_client_errs();

  free_charsets();

  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=

sql/mysql_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -1156,6 +1156,7 @@ extern uint opt_large_page_size; 
extern MYSQL_LOG mysql_log,mysql_slow_log,mysql_bin_log;

extern FILE *bootstrap_file;

extern int bootstrap_error;

extern FILE *stderror_file;

extern pthread_key(MEM_ROOT**,THR_MALLOC);

extern pthread_mutex_t LOCK_mysql_create_db,LOCK_Acl,LOCK_open,

       LOCK_thread_count,LOCK_mapped_file,LOCK_user_locks, LOCK_status,

sql/mysqld.cc

+2 −1
Original line number Diff line number Diff line
@@ -447,6 +447,7 @@ Le_creator le_creator; 


FILE *bootstrap_file;

int bootstrap_error;

FILE *stderror_file=0;



I_List<i_string_pair> replicate_rewrite_db;

I_List<i_string> replicate_do_db, replicate_ignore_db;
@@ -2878,7 +2879,7 @@ server."); 
#ifndef EMBEDDED_LIBRARY

      if (freopen(log_error_file, "a+", stdout))

#endif

	freopen(log_error_file, "a+", stderr);

	stderror_file= freopen(log_error_file, "a+", stderr);

    }

  }