mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
fixed --skip-slave-thread bug
added PURGE MASTER LOGS TO and SHOW MASTER LOGS fixed the output of SHOW MASTER STATUS updated docs Docs/manual.texi: Update for PURGE MASTER LOGS TO, SHOW MASTER LOGS sql/lex.h: added PURGE sql/log.cc: update for PURGE BitKeeper/etc/ignore: Added include/.my_sys.h.swp PENDING/2000-10-25.01 PENDING/2000-10-25.02 support-files/mysql-3.23.27-beta.spec to the ignore list sql/mysqld.cc: fixed bug in --skip-slave-start sql/sql_class.cc: added linfo to THD sql/sql_class.h: updates for PURGE sql/sql_lex.h: updates for PURGE sql/sql_parse.cc: updates for PURGE sql/sql_repl.cc: updates for PURGE sql/sql_repl.h: updates for PURGE sql/sql_yacc.yy: updates for PURGE
This commit is contained in:
@ -158,6 +158,8 @@ static bool opt_log,opt_update_log,opt_bin_log,opt_slow_log,opt_noacl,
|
||||
opt_disable_networking=0, opt_bootstrap=0,opt_skip_show_db=0,
|
||||
opt_ansi_mode=0,opt_myisam_log=0;
|
||||
bool opt_sql_bin_update = 0, opt_log_slave_updates = 0;
|
||||
extern MASTER_INFO glob_mi;
|
||||
extern int init_master_info(MASTER_INFO* mi);
|
||||
|
||||
// if sql_bin_update is true, SQL_LOG_UPDATE and SQL_LOG_BIN are kept in sync, and are
|
||||
// treated as aliases for each other
|
||||
@ -1618,6 +1620,8 @@ int main(int argc, char **argv)
|
||||
if(!opt_skip_slave_start &&
|
||||
pthread_create(&hThread, &connection_attrib, handle_slave, 0))
|
||||
sql_print_error("Warning: Can't create thread to handle slave");
|
||||
else if(opt_skip_slave_start)
|
||||
init_master_info(&glob_mi);
|
||||
}
|
||||
else
|
||||
sql_print_error("Server id is not set, slave thread will not be started");
|
||||
|
Reference in New Issue
Block a user