diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-03-10 12:08:53 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-03-10 12:08:53 +0100 |
| commit | f53afa23e6d5ac33a733dc1bf07344dc59c79098 (patch) | |
| tree | c53fec0bed7e2514678048481a124423dd008d79 /client | |
| parent | 26acf8d722c07908486b364b174dbd831aa49eb8 (diff) | |
| download | mariadb-git-f53afa23e6d5ac33a733dc1bf07344dc59c79098.tar.gz | |
Improve mysqltest
Add comment's for enable/disable_query_log and enable/disable_result_log
Update comment for "check_result"
Add check in "handle_error" that detects if the server crashed when running a "require" query to check if a certain feature is available
client/mysqltest.c:
Add comment's for enable/disable_query_log and enable/disable_result_log
Update comment for "check_result"
Add check in "handle_error" that detects if the server crashed when running a "require" query to check if a certain feature is available
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index beb76317f40..715bca853cb 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -393,8 +393,10 @@ const char *command_names[]= "enable_rpl_parse", "disable_rpl_parse", "eval_result", + /* Enable/disable that the _query_ is logged to result file */ "enable_query_log", "disable_query_log", + /* Enable/disable that the _result_ from a query is logged to result file */ "enable_result_log", "disable_result_log", "server_start", @@ -753,8 +755,8 @@ err: check_result ds - content to be checked fname - name of file to check against - require_option - if set and check fails, the test will be aborted with the special - exit code "not supported test" + require_option - if set and check fails, the test will be aborted + with the special exit code "not supported test" RETURN VALUES error - the function will not return @@ -3481,7 +3483,17 @@ static void handle_error(const char *query, struct st_query *q, DBUG_ENTER("handle_error"); if (q->require_file) + { + /* + The query after a "--require" failed. This is fine as long the server + returned a valid reponse. Don't allow 2013 or 2006 to trigger an + abort_not_supported_test + */ + if (err_errno == CR_SERVER_LOST || + err_errno == CR_SERVER_GONE_ERROR) + die("require query '%s' failed: %d: %s", query, err_errno, err_error); abort_not_supported_test(); + } if (q->abort_on_error) die("query '%s' failed: %d: %s", query, err_errno, err_error); |