References lp:1034621 - Merge up to mysql-5.5.25 level

   merged codership-mysql/5.5 revisions: bzr diff -r3759..3767
   merged codership-mysql/5.5 revisions: bzr diff -r3768..3771

1 files changed, 39 insertions, 11 deletions

diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index b93c9426deb..f204f359656 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -621,6 +621,8 @@ void free_all_replace(){
   free_replace_column();
 }
 
+void var_set_int(const char* name, int value);
+
 
 class LogFile {
   FILE* m_file;
@@ -1275,6 +1277,8 @@ void handle_command_error(struct st_command *command, uint error,
 {
   DBUG_ENTER("handle_command_error");
   DBUG_PRINT("enter", ("error: %d", error));
+  var_set_int("$sys_errno",sys_errno);
+  var_set_int("$errno",error);
   if (error != 0)
   {
     int i;
@@ -1285,7 +1289,7 @@ void handle_command_error(struct st_command *command, uint error,
                     "errno: %d",
           command->first_word_len, command->query, error, my_errno,
           sys_errno);
-      return;
+      DBUG_VOID_RETURN;
     }
 
     i= match_expected_error(command, error, NULL);
@@ -5201,15 +5205,32 @@ const char *get_errname_from_code (uint error_code)
 void do_get_errcodes(struct st_command *command)
 {
   struct st_match_err *to= saved_expected_errors.err;
-  char *p= command->first_argument;
-  uint count= 0;
-  char *next;
-
   DBUG_ENTER("do_get_errcodes");
 
-  if (!*p)
+  if (!*command->first_argument)
     die("Missing argument(s) to 'error'");
 
+  /* TODO: Potentially, there is a possibility of variables 
+     being expanded twice, e.g.
+
+     let $errcodes = 1,\$a;
+     let $a = 1051;
+     error $errcodes;
+     DROP TABLE unknown_table;
+     ...
+     Got one of the listed errors
+
+     But since it requires manual escaping, it does not seem 
+     particularly dangerous or error-prone. 
+  */
+  DYNAMIC_STRING ds;
+  init_dynamic_string(&ds, 0, command->query_len + 64, 256);
+  do_eval(&ds, command->first_argument, command->end, !is_windows);
+  char *p= ds.str;
+
+  uint count= 0;
+  char *next;
+
   do
   {
     char *end;
@@ -5319,11 +5340,15 @@ void do_get_errcodes(struct st_command *command)
 
   } while (*p);
 
-  command->last_argument= p;
+  command->last_argument= command->first_argument;
+  while (*command->last_argument)
+    command->last_argument++;
+  
   to->type= ERR_EMPTY;                        /* End of data */
 
   DBUG_PRINT("info", ("Expected errors: %d", count));
   saved_expected_errors.count= count;
+  dynstr_free(&ds);
   DBUG_VOID_RETURN;
 }
 
@@ -9012,8 +9037,12 @@ int main(int argc, char **argv)
     command->abort_on_error= (command->expected_errors.count == 0 &&
                               abort_on_error);
     
-    /* delimiter needs to be executed so we can continue to parse */
-    ok_to_do= cur_block->ok || command->type == Q_DELIMITER;
+    /*
+      some commmands need to be executed or at least parsed unconditionally,
+      because they change the grammar.
+    */
+    ok_to_do= cur_block->ok || command->type == Q_DELIMITER
+                            || command->type == Q_PERL;
     /*
       Some commands need to be "done" the first time if they may get
       re-iterated over in a true context. This can only happen if there's 
@@ -9024,8 +9053,7 @@ int main(int argc, char **argv)
       if (command->type == Q_SOURCE ||
           command->type == Q_ERROR ||
           command->type == Q_WRITE_FILE ||
-          command->type == Q_APPEND_FILE ||
-	  command->type == Q_PERL)
+          command->type == Q_APPEND_FILE)
       {
 	for (struct st_block *stb= cur_block-1; stb >= block_stack; stb--)
 	{