database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

merged with 3.23 replication updates

Browse Source 
mysql-test/r/type_float.result:
  Auto merged
sql/sql_repl.h:
  Auto merged
BitKeeper/triggers/post-commit:
  merged with 3.23 updates
sql/mysqld.cc:
  merged
sql/slave.cc:
  merged
sql/sql_repl.cc:
  merged
This commit is contained in:
unknown
2001-06-28 19:48:49 -06:00
parent 09b6895fac 62febccfec
commit 1ed2bcc888
11 changed files with 120 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/slave.cc
View File

@ -1349,6 +1349,8 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
goto err;
}
connected:
// register ourselves with the master
// if fails, this is not fatal - we just print the error message and go
// on with life
@ -1397,7 +1399,7 @@ try again, log '%s' at postion %s", RPL_LOG_NAME,
goto err;
}
continue;
goto connected;
}
@ -1448,8 +1450,9 @@ reconnecting to retry, log '%s' position %s", RPL_LOG_NAME,
reconnect done to recover from failed read");
goto err;
}
break;
}
goto connected;
} // if(event_len == packet_error)
thd->proc_info = "Processing master log event";
if(exec_event(thd, &mysql->net, &glob_mi, event_len))
@ -1492,9 +1495,8 @@ the slave thread with \"mysqladmin start-slave\". We stopped at log \
events_till_disconnect++;
}
#endif
}
}
} // while(!slave_killed(thd)) - read/exec loop
} // while(!slave_killed(thd)) - slave loop
// error = 0;
err: