From aaaf49814682e7eb1c947eef8c59f8b2d20461a1 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 4 Apr 2007 15:09:12 +0200 Subject: Add expansion of $variables in "let from query", "if with query" and "while with query" --- client/mysqltest.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'client') diff --git a/client/mysqltest.c b/client/mysqltest.c index 170819e9a1e..0a1b3aa239c 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1328,6 +1328,7 @@ void var_query_set(VAR *var, const char *query, const char** query_end) MYSQL_RES *res; MYSQL_ROW row; MYSQL* mysql = &cur_con->mysql; + DYNAMIC_STRING ds_query; DBUG_ENTER("var_query_set"); LINT_INIT(res); @@ -1337,13 +1338,17 @@ void var_query_set(VAR *var, const char *query, const char** query_end) die("Syntax error in query, missing '`'"); ++query; - if (mysql_real_query(mysql, query, (int)(end - query)) || + /* Eval the query, thus replacing all environment variables */ + init_dynamic_string(&ds_query, 0, (end - query) + 32, 256); + do_eval(&ds_query, query, end, FALSE); + + if (mysql_real_query(mysql, ds_query.str, ds_query.length) || !(res = mysql_store_result(mysql))) { - *end = 0; - die("Error running query '%s': %d %s", query, + die("Error running query '%s': %d %s", ds_query.str, mysql_errno(mysql), mysql_error(mysql)); } + dynstr_free(&ds_query); if ((row = mysql_fetch_row(res)) && row[0]) { -- cgit v1.2.1 From a3583bf3b55f97dddba183d288102edd022c8304 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 4 Apr 2007 15:15:40 +0200 Subject: Add "skip" function, makeing mysqltest return an error code indicating test should be skipped --- client/mysqltest.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'client') diff --git a/client/mysqltest.c b/client/mysqltest.c index 0a1b3aa239c..c2fd7a4ff0d 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -276,7 +276,7 @@ enum enum_commands { Q_IF, Q_DISABLE_PARSING, Q_ENABLE_PARSING, Q_REPLACE_REGEX, Q_REMOVE_FILE, Q_FILE_EXIST, - Q_WRITE_FILE, Q_COPY_FILE, Q_PERL, Q_DIE, Q_EXIT, + Q_WRITE_FILE, Q_COPY_FILE, Q_PERL, Q_DIE, Q_EXIT, Q_SKIP, Q_CHMOD_FILE, Q_APPEND_FILE, Q_CAT_FILE, Q_DIFF_FILES, Q_UNKNOWN, /* Unknown command. */ @@ -358,6 +358,7 @@ const char *command_names[]= "die", /* Don't execute any more commands, compare result */ "exit", + "skip", "chmod", "append_file", "cat_file", @@ -6258,6 +6259,9 @@ int main(int argc, char **argv) /* Stop processing any more commands */ abort_flag= 1; break; + case Q_SKIP: + abort_not_supported_test("%s", command->first_argument); + break; case Q_RESULT: die("result, deprecated command"); -- cgit v1.2.1