diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-04-17 14:41:16 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-04-17 14:41:16 +0300 |
| commit | 763f105dff3aada394cd7c6b94b3e5867f79c1b9 (patch) | |
| tree | a41e99e7343f5bdd8970e3a1f9bfd6d769a20bc3 /sql/net_serv.cc | |
| parent | 48892844a9eab3c69143e1ae45690de3e947b650 (diff) | |
| download | mariadb-git-763f105dff3aada394cd7c6b94b3e5867f79c1b9.tar.gz | |
Fixed federated and some replication tests to not stop slave until it's up and running.
(Removes some warnings about UNIX_TIMESTAMP from the slave.err logs)
Marked federated_server as a '--big-test'
Change error in net_clear to 'Note', as it interfered with mysql-test-run.
client/mysqltest.c:
More DBUG messages
Adding missing DBUG_RETURN
mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
Added missing sync_slave_with_master
mysql-test/extra/rpl_tests/rpl_relayrotate.test:
Added missing sync_slave_with_master
mysql-test/include/federated.inc:
Don't do stop slave before the slave has started properly
(Removes some warnings about UNIX_TIMESTAMP from the slave.err logs)
mysql-test/include/federated_cleanup.inc:
Trivial cleanup
mysql-test/t/federated_server.test:
Don't run this unless under --big-test
Made test-loop smaller. (We will find out errors in code over time, as the test is run under a lot of difference machines which will compensate for the smaller loop)
mysql-test/t/rpl_flushlog_loop.test:
Added missing sync_slave_with_master
sql/net_serv.cc:
Change error to Note (low level warning), as it interfered with mysql-test-run.
This is probably fine as we in some context on sever shutdown can get information about connection shutdown on the connection while we are doing a query at the same time.
Still, in normal context one should get this, so it's good to have it in the log as it enables one to find errors easier.
sql/slave.cc:
Added reason to why things failed to error message
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 778f82c92ef..719e2ee0d3c 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -299,7 +299,7 @@ void net_clear(NET *net, my_bool clear_buffer) DBUG_PRINT("info",("skipped %d bytes from file: %s", count, vio_description(net->vio))); #if defined(EXTRA_DEBUG) - fprintf(stderr,"Error: net_clear() skipped %d bytes from file: %s\n", + fprintf(stderr,"Note: net_clear() skipped %d bytes from file: %s\n", count, vio_description(net->vio)); #endif } |