mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
merged with 3.23
configure.in: Auto merged myisam/mi_check.c: Auto merged myisam/myisamchk.c: Auto merged sql/mysqld.cc: Auto merged sql/slave.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_update.cc: Auto merged Docs/manual.texi: merged mysql-test/t/rpl_sporadic_master.test: merged sql/Makefile.am: merged sql/slave.h: merged
This commit is contained in:
@ -2,6 +2,10 @@
|
||||
#define SLAVE_H
|
||||
|
||||
#include "mysql.h"
|
||||
#define SLAVE_NET_TIMEOUT 3600
|
||||
|
||||
extern ulong slave_net_timeout;
|
||||
|
||||
|
||||
typedef struct st_master_info
|
||||
{
|
||||
|
Reference in New Issue
Block a user