diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-10-11 13:54:06 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-10-11 13:54:06 -0600 |
| commit | 56303b0383da01a94293927c209a962effd930d0 (patch) | |
| tree | d2e073808531804402cf154ac12d525851282b35 /client | |
| parent | 2f4e168159e72028633fe5005dd3e85211fc476e (diff) | |
| download | mariadb-git-56303b0383da01a94293927c209a962effd930d0.tar.gz | |
fixes for mysql-test to run without manager
a bit more work on failsafe replication
client/mysqltest.c:
added require_manager support
mysql-test/mysql-test-run.sh:
added --no-manager
mysql-test/r/rpl_failsafe.result:
updated result
mysql-test/t/rpl000018.test:
must have manager
mysql-test/t/rpl_failsafe.test:
must have manager
sql/repl_failsafe.cc:
more work
sql/repl_failsafe.h:
more work
sql/slave.cc:
update replication status for fail-safe replication on different events
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index c6169540469..1bf3ab75aed 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -181,7 +181,7 @@ Q_PING, Q_EVAL, Q_RPL_PROBE, Q_ENABLE_RPL_PARSE, Q_DISABLE_RPL_PARSE, Q_EVAL_RESULT, Q_ENABLE_QUERY_LOG, Q_DISABLE_QUERY_LOG, -Q_SERVER_START, Q_SERVER_STOP, +Q_SERVER_START, Q_SERVER_STOP,Q_REQUIRE_MANAGER, Q_UNKNOWN, /* Unknown command. */ Q_COMMENT, /* Comments, ignored. */ Q_COMMENT_WITH_COMMAND @@ -215,6 +215,7 @@ const char *command_names[] = { "disable_rpl_parse", "eval_result", "enable_query_log", "disable_query_log", "server_start", "server_stop", + "require_manager", 0 }; @@ -640,6 +641,13 @@ int open_file(const char* name) return 0; } +int do_require_manager(struct st_query* __attribute__((unused)) q) +{ + if (!manager) + abort_not_supported_test(); + return 0; +} + #ifndef EMBEDDED_LIBRARY int do_server_start(struct st_query* q) { @@ -1930,7 +1938,9 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags) ds= &ds_res; if ((flags & QUERY_SEND) && mysql_send_query(mysql, query, query_len)) - die("At line %u: unable to send query '%s'", start_lineno, query); + die("At line %u: unable to send query '%s'(mysql_errno=%d,errno=%d)", + start_lineno, query, + mysql_errno(mysql), errno); if ((flags & QUERY_SEND) && !disable_query_log) { dynstr_append_mem(ds,query,query_len); @@ -2236,6 +2246,7 @@ int main(int argc, char** argv) case Q_DISABLE_QUERY_LOG: disable_query_log=1; break; case Q_SOURCE: do_source(q); break; case Q_SLEEP: do_sleep(q); break; + case Q_REQUIRE_MANAGER: do_require_manager(q); break; #ifndef EMBEDDED_LIBRARY case Q_SERVER_START: do_server_start(q); break; case Q_SERVER_STOP: do_server_stop(q); break; |