diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-07-16 22:08:41 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-07-16 22:08:41 +0300 |
| commit | 2547e933c8c03249f5295aa71a50ce2b35fc3dd8 (patch) | |
| tree | 61d06f5a553daa4b0c9e04f4325a74c7db10ca14 /sql | |
| parent | 43376d554f7449a261ecedb057fa113a409b3225 (diff) | |
| parent | 39859d5d7cf2585b01f01204c7a664d10f3ee89e (diff) | |
| download | mariadb-git-2547e933c8c03249f5295aa71a50ce2b35fc3dd8.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
sql/slave.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/slave.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 65fc807cc2b..dd815037d5e 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -456,7 +456,7 @@ int fetch_nx_table(THD* thd, MASTER_INFO* mi) nx_errno = ER_BAD_HOST_ERROR; goto err; } - + mysql->net.timeout=slave_net_timeout; safe_connect(thd, mysql, mi); if (slave_killed(thd)) goto err; @@ -1312,6 +1312,7 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused))) goto err; } + mysql->net.timeout=slave_net_timeout; thd->proc_info = "connecting to master"; #ifndef DBUG_OFF sql_print_error("Slave thread initialized"); |