merge 48671

client/mysqltest.cc

@@ -3632,13 +3632,22 @@ void do_perl(struct st_command *command)
                      sizeof(perl_args)/sizeof(struct command_arg),
                      ' ');
 
+  ds_script= command->content;
+  /* If it hasn't been done already by a loop iteration, fill it in */
+  if (! ds_script.str)
+  {
     /* If no delimiter was provided, use EOF */
     if (ds_delimiter.length == 0)
       dynstr_set(&ds_delimiter, "EOF");
 
     init_dynamic_string(&ds_script, "", 1024, 1024);
     read_until_delimiter(&ds_script, &ds_delimiter);
+    command->content= ds_script;
+  }
 
+  /* This function could be called even if "false", so check before doing */
+  if (cur_block->ok)
+  {
     DBUG_PRINT("info", ("Executing perl: %s", ds_script.str));
 
     /* Create temporary file name */
@@ -3674,7 +3683,7 @@ void do_perl(struct st_command *command)
     my_delete(temp_file_path, MYF(0));
 
     handle_command_error(command, WEXITSTATUS(error));
-  dynstr_free(&ds_script);
+  }
   dynstr_free(&ds_delimiter);
   DBUG_VOID_RETURN;
 }

mysql-test/r/mysqltest.result

@@ -553,6 +553,8 @@ hello
 mysqltest: At line 1: Max delimiter length(16) exceeded
 hello
 hello
+val is 5
+val is 5
 mysqltest: At line 1: test of die
 Some output
 create table t1( a int, b char(255), c timestamp);

mysql-test/t/mysqltest.test

@@ -1905,6 +1905,20 @@ perl;
   print "hello\n";
 EOF
 
+# Test perl within while, also with if being false first iteration
+let $outer= 3;
+let $ifval= 0;
+while ($outer) {
+  if ($ifval) {
+    perl UNTIL;
+      my $val= 5;
+      print "val is $val\n";
+UNTIL
+  }
+  inc $ifval;
+  dec $outer;
+}
+
 # ----------------------------------------------------------------------------
 # test for die
 # ----------------------------------------------------------------------------