Commit 58de4d7e authored by unknown's avatar unknown

Remove confusing printouts from expected to fail "system" commands


client/mysqltest.c:
  Add missing DBUG_VOID_RETURN
  Log failure to run "system" into result log 
  Add DBUG_PRINT for the sleep value used in do_sleep
mysql-test/r/mysqltest.result:
  Update test results
mysql-test/t/mysqltest.test:
  Mask outpu from failed system command
parent 152b89c9
...@@ -1134,6 +1134,7 @@ static void do_exec(struct st_query *query) ...@@ -1134,6 +1134,7 @@ static void do_exec(struct st_query *query)
} }
free_replace(); free_replace();
DBUG_VOID_RETURN;
} }
...@@ -1300,10 +1301,13 @@ int do_modify_var(struct st_query *query, const char *name, ...@@ -1300,10 +1301,13 @@ int do_modify_var(struct st_query *query, const char *name,
int do_system(struct st_query *q) int do_system(struct st_query *q)
{ {
DYNAMIC_STRING *ds;
char *p=q->first_argument; char *p=q->first_argument;
VAR v; VAR v;
var_init(&v, 0, 0, 0, 0); var_init(&v, 0, 0, 0, 0);
eval_expr(&v, p, 0); /* NULL terminated */ eval_expr(&v, p, 0); /* NULL terminated */
ds= &ds_res;
if (v.str_val_len) if (v.str_val_len)
{ {
char expr_buf[1024]; char expr_buf[1024];
...@@ -1316,8 +1320,11 @@ int do_system(struct st_query *q) ...@@ -1316,8 +1320,11 @@ int do_system(struct st_query *q)
{ {
if (q->abort_on_error) if (q->abort_on_error)
die("system command '%s' failed", expr_buf); 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 else
...@@ -1582,6 +1589,7 @@ int do_sleep(struct st_query *query, my_bool real_sleep) ...@@ -1582,6 +1589,7 @@ int do_sleep(struct st_query *query, my_bool real_sleep)
if (opt_sleep && !real_sleep) if (opt_sleep && !real_sleep)
sleep_val= opt_sleep; sleep_val= opt_sleep;
DBUG_PRINT("info", ("sleep_val: %f", sleep_val));
my_sleep((ulong) (sleep_val * 1000000L)); my_sleep((ulong) (sleep_val * 1000000L));
query->last_argument= sleep_end; query->last_argument= sleep_end;
return 0; return 0;
......
...@@ -304,6 +304,7 @@ mysqltest: At line 1: End of line junk detected: "1000" ...@@ -304,6 +304,7 @@ mysqltest: At line 1: End of line junk detected: "1000"
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: 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 mysqltest: At line 1: system command 'false' failed
system command 'NonExistsinfComamdn 2> /dev/null' failed
test test
test2 test2
test3 test3
......
...@@ -689,7 +689,7 @@ system echo "hej" > /dev/null; ...@@ -689,7 +689,7 @@ system echo "hej" > /dev/null;
--exec echo "system false;" | $MYSQL_TEST 2>&1 --exec echo "system false;" | $MYSQL_TEST 2>&1
--disable_abort_on_error --disable_abort_on_error
system NonExistsinfComamdn; system NonExistsinfComamdn 2> /dev/null;
--enable_abort_on_error --enable_abort_on_error
...@@ -1026,4 +1026,3 @@ drop table t1; ...@@ -1026,4 +1026,3 @@ drop table t1;
drop table t1; drop table t1;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment