diff options
| author | guilhem@mysql.com <> | 2004-06-23 23:52:49 +0200 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2004-06-23 23:52:49 +0200 |
| commit | bccf57fbb238ace44ae97d0e8d96e32d64a22508 (patch) | |
| tree | cb0e5539d9cb336a3feffb4f64e960f60c923cdf /client | |
| parent | 334eb77356e6e189419517fa42f0a5567017e85f (diff) | |
| parent | c267b19db286e1a6bd955ee7736c257fa3f7e578 (diff) | |
| download | mariadb-git-bccf57fbb238ace44ae97d0e8d96e32d64a22508.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 88b7917612e..5dea587872c 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -224,7 +224,7 @@ Q_ENABLE_QUERY_LOG, Q_DISABLE_QUERY_LOG, Q_ENABLE_RESULT_LOG, Q_DISABLE_RESULT_LOG, Q_SERVER_START, Q_SERVER_STOP,Q_REQUIRE_MANAGER, Q_WAIT_FOR_SLAVE_TO_STOP, -Q_REQUIRE_VERSION, +Q_REQUIRE_VERSION, Q_REQUIRE_OS, Q_ENABLE_WARNINGS, Q_DISABLE_WARNINGS, Q_ENABLE_INFO, Q_DISABLE_INFO, Q_ENABLE_METADATA, Q_DISABLE_METADATA, @@ -298,6 +298,7 @@ const char *command_names[]= "require_manager", "wait_for_slave_to_stop", "require_version", + "require_os", "enable_warnings", "disable_warnings", "enable_info", @@ -853,6 +854,28 @@ int do_require_version(struct st_query* q) return 0; } +int do_require_os(struct st_query* q) +{ + char *p=q->first_argument, *os_arg; + LINT_INIT(res); + DBUG_ENTER("do_require_os"); + + if (!*p) + die("Missing version argument in require_os\n"); + os_arg= p; + while (*p && !my_isspace(charset_info,*p)) + p++; + *p = 0; + + if (strcmp(os_arg, "unix")) + die("For now only testing of os=unix is implemented\n"); + +#if defined(__NETWARE__) || defined(__WIN__) || defined(__OS2__) + abort_not_supported_test(); +#endif + DBUG_RETURN(0); +} + int do_source(struct st_query* q) { char* p=q->first_argument, *name; @@ -2715,6 +2738,7 @@ int main(int argc, char **argv) case Q_SLEEP: do_sleep(q, 0); break; case Q_REAL_SLEEP: do_sleep(q, 1); break; case Q_REQUIRE_VERSION: do_require_version(q); break; + case Q_REQUIRE_OS: do_require_os(q); break; case Q_WAIT_FOR_SLAVE_TO_STOP: do_wait_for_slave_to_stop(q); break; case Q_REQUIRE_MANAGER: do_require_manager(q); break; #ifndef EMBEDDED_LIBRARY |