From 19801cbfdc7cf099df103c2c88a2b47b95081816 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.blaudden" <>
Date: Wed, 4 Apr 2007 15:09:12 +0200
Subject: [PATCH 1/2] Add expansion of $variables in "let from query", "if with
 query" and "while with query"

---
 client/mysqltest.c            | 11 ++++++++---
 mysql-test/r/mysqltest.result |  3 +++
 mysql-test/t/mysqltest.test   | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

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])
   {
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index 71f1c7de4ed..ba37284e597 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -268,6 +268,9 @@ mysqltest: At line 1: Missing assignment operator in let
 1
 # Execute: echo $success ;
 1 
+var2: content of variable 1
+var3: content of variable 1 content of variable 1
+length of var3 is longer than 0
 mysqltest: At line 1: Missing required argument 'filename' to command 'source'
 mysqltest: At line 1: Could not open file ./non_existingFile
 mysqltest: In included file "MYSQLTEST_VARDIR/tmp/recursive.sql": At line 1: Source directives are nesting too deep
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index 221ad5d5c6e..9a7139187b5 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -685,6 +685,21 @@ echo # <whatever> success: $success ;
 --echo # Execute: echo \$success ;
 echo $success ;
 
+# ----------------------------------------------------------------------------
+# Test let from query with $variable
+# let $<var_name>=`<query with $variable>`;
+# ----------------------------------------------------------------------------
+
+let $var1=content of variable 1;
+let $var2= `select "$var1"`;
+let $var3= `select concat("$var1", " ", "$var2")`;
+echo var2: $var2;
+echo var3: $var3;
+if (`select length("$var3") > 0`)
+{
+  echo length of var3 is longer than 0;
+}
+
 # ----------------------------------------------------------------------------
 # Test to assign let from query
 # let $<var_name>=`<query>`;

From fc992b0667ba10c6fcb83152378b512944b0ed4e Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.blaudden" <>
Date: Wed, 4 Apr 2007 15:15:40 +0200
Subject: [PATCH 2/2] 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(-)

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");