diff options
| author | unknown <monty@work.mysql.com> | 2001-07-18 23:58:10 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-07-18 23:58:10 +0200 |
| commit | 61c04f0e9c934455eddef0cb97f2f8950980c131 (patch) | |
| tree | fb907efd0b1549145b9fc6f82ddd7107f4ab8a55 /sql/slave.cc | |
| parent | 90acfb9ff36c796650b40c8b85f2f4042c60d1fc (diff) | |
| parent | dece009c8b84f6ee60cf43e32931debc361b932c (diff) | |
| download | mariadb-git-61c04f0e9c934455eddef0cb97f2f8950980c131.tar.gz | |
merge
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
sql/mysqld.cc:
Auto merged
mysql-test/t/bdb.test:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_update.cc:
Auto merged
configure.in:
New version
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 488fb357c52..a00809b6994 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -735,6 +735,7 @@ static int init_slave_thread(THD* thd) thd->system_thread = thd->bootstrap = 1; thd->client_capabilities = 0; my_net_init(&thd->net, 0); + thd->net.timeout = slave_net_timeout; thd->max_packet_length=thd->net.max_packet; thd->master_access= ~0; thd->priv_user = 0; @@ -1330,6 +1331,8 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused))) thd->thread_stack = (char*)&thd; // remember where our stack is thd->temporary_tables = save_temporary_tables; // restore temp tables threads.append(thd); + glob_mi.pending = 0; //this should always be set to 0 when the slave thread + // is started DBUG_PRINT("info",("master info: log_file_name=%s, position=%s", glob_mi.log_file_name, llstr(glob_mi.pos,llbuff))); |