From: msvensson
Date: December 13 2005 5:47pm
Subject: bk commit into 5.0 tree (msvensson:1.1974)
List-Archive: http://lists.mysql.com/commits/119
Message-Id: <20051213174740.C0CEB207870@localhost.localdomain>

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1974 05/12/13 18:47:34 msvensson@neptunus.(none) +3 -0
  Remove confusing printouts from expected to fail "system" commands

  mysql-test/t/mysqltest.test
    1.24 05/12/13 18:47:30 msvensson@neptunus.(none) +1 -2
    Mask outpu from failed system command

  mysql-test/r/mysqltest.result
    1.20 05/12/13 18:47:30 msvensson@neptunus.(none) +1 -0
    Update test results

  client/mysqltest.c
    1.187 05/12/13 18:47:29 msvensson@neptunus.(none) +10 -2
    Add missing DBUG_VOID_RETURN
    Log failure to run "system" into result log 
    Add DBUG_PRINT for the sleep value used in do_sleep

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/wl2930/my50-wl2930-integration

--- 1.19/mysql-test/r/mysqltest.result	2005-12-13 18:07:08 +01:00
+++ 1.20/mysql-test/r/mysqltest.result	2005-12-13 18:47:30 +01:00
@@ -304,6 +304,7 @@
 mysqltest: At line 1: Missing arguments to system, nothing to do!
 mysqltest: At line 1: Missing arguments to system, nothing to do!
 mysqltest: At line 1: system command 'false' failed
+system command 'NonExistsinfComamdn 2> /dev/null' failed
 test
 test2
 test3

--- 1.23/mysql-test/t/mysqltest.test	2005-12-13 18:07:08 +01:00
+++ 1.24/mysql-test/t/mysqltest.test	2005-12-13 18:47:30 +01:00
@@ -689,7 +689,7 @@
 --exec echo "system false;" | $MYSQL_TEST 2>&1
 
 --disable_abort_on_error
-system NonExistsinfComamdn;
+system NonExistsinfComamdn 2> /dev/null;
 --enable_abort_on_error
 
 
@@ -1024,6 +1024,5 @@
 # The .out file should exist
 --exec test -s $MYSQL_TEST_DIR/var/tmp/bug11731.out
 drop table t1;
-
 
 

--- 1.186/client/mysqltest.c	2005-12-13 18:10:49 +01:00
+++ 1.187/client/mysqltest.c	2005-12-13 18:47:29 +01:00
@@ -1134,6 +1134,7 @@
   }
 
   free_replace();
+  DBUG_VOID_RETURN;
 }
 
 
@@ -1300,10 +1301,13 @@
 
 int do_system(struct st_query *q)
 {
+  DYNAMIC_STRING *ds;
   char *p=q->first_argument;
   VAR v;
   var_init(&v, 0, 0, 0, 0);
   eval_expr(&v, p, 0); /* NULL terminated */
+  ds= &ds_res;
+
   if (v.str_val_len)
   {
     char expr_buf[1024];
@@ -1316,8 +1320,11 @@
     {
       if (q->abort_on_error)
         die("system command '%s' failed", expr_buf);
-      /* If ! abort_on_error, display message and continue */
-      verbose_msg("system command '%s' failed", expr_buf);
+
+      /* If ! abort_on_error, log message and continue */
+      dynstr_append(ds, "system command '");
+      replace_dynstr_append(ds, expr_buf);
+      dynstr_append(ds, "' failed\n");
     }
   }
   else
@@ -1582,6 +1589,7 @@
   if (opt_sleep && !real_sleep)
     sleep_val= opt_sleep;
 
+  DBUG_PRINT("info", ("sleep_val: %f", sleep_val));
   my_sleep((ulong) (sleep_val * 1000000L));
   query->last_argument= sleep_end;
   return 0;