mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
028a672fd6
by adding sleep-and-retries (max 4 times) if MASTER_POS_WAIT() returns NULL in sync_with_master and sync_slave_with_master. The problem showed up only today, in MySQL 5.0 in rpl_server_id2.test, but may affect 4.x as well, so fixing it here. Note that I am also fixing 5.0 too, with the same exact patch, because I don't want to leave 5.0 broken until the next 4.0->4.1->5.0 merge. client/mysqltest.c: in sync_with_master (and sync_slave_with_master), if MASTER_POS_WAIT() returns NULL, it may be that the slave SQL thread did not have time to start yes, so we sleep 1 sec and retry, 4 times at most. mysql-test/r/rpl_server_id2.result: result update mysql-test/t/rpl_server_id2.test: master_slave.inc already drops the table |
||
|---|---|---|
| .. | ||
| .cvsignore | ||
| client_priv.h | ||
| completion_hash.cc | ||
| completion_hash.h | ||
| connect_test.c | ||
| get_password.c | ||
| insert_test.c | ||
| list_test.c | ||
| Makefile.am | ||
| my_readline.h | ||
| mysql.cc | ||
| mysqladmin.c | ||
| mysqlbinlog.cc | ||
| mysqlcheck.c | ||
| mysqldump.c | ||
| mysqlimport.c | ||
| mysqlmanager-pwgen.c | ||
| mysqlmanagerc.c | ||
| mysqlshow.c | ||
| mysqltest.c | ||
| readline.cc | ||
| select_test.c | ||
| showdb_test.c | ||
| sql_string.cc | ||
| sql_string.h | ||
| ssl_test.c | ||
| thimble.cc | ||
| thread_test.c | ||