summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysqltest.test
diff options
context:
space:
mode:
authorBjorn Munch <Bjorn.Munch@sun.com>2010-02-09 18:13:57 +0100
committerBjorn Munch <Bjorn.Munch@sun.com>2010-02-09 18:13:57 +0100
commit0ad9a5992d0832b07beaa5326d4d53e36669184d (patch)
tree5fb7bdbbd2fc2f86c74c329eea8b3fc39c7ef47e /mysql-test/t/mysqltest.test
parent97219cb9ef0edfed4679e92ce55a2f980e784eed (diff)
downloadmariadb-git-0ad9a5992d0832b07beaa5326d4d53e36669184d.tar.gz
Bug #50618 Please allow 'sleep $variable' in mtr
Made mtr's sleep function understand $variables A few fixes since previous patch, added tests
Diffstat (limited to 'mysql-test/t/mysqltest.test')
-rw-r--r--mysql-test/t/mysqltest.test22
1 files changed, 22 insertions, 0 deletions
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index 20b35d41515..25293ff29e7 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -920,6 +920,28 @@ sleep 0.5;
sleep 1;
real_sleep 1;
+# Parameter from variable, legal and illegal
+let $sleep_var= 0.1;
+sleep $sleep_var;
+let $sleep_var= 1;
+--real_sleep $sleep_var
+
+--write_file $MYSQL_TMP_DIR/sleep.inc
+let $sleep_var= xyz;
+--sleep $sleep_var
+EOF
+--error 1
+--exec $MYSQL_TEST < $MYSQL_TMP_DIR/sleep.inc 2>&1
+--remove_file $MYSQL_TMP_DIR/sleep.inc
+
+--write_file $MYSQL_TMP_DIR/sleep.inc
+let $sleep_var= xyz;
+real_sleep $sleep_var;
+EOF
+--error 1
+--exec $MYSQL_TEST < $MYSQL_TMP_DIR/sleep.inc 2>&1
+--remove_file $MYSQL_TMP_DIR/sleep.inc
+
# Missing parameter
--error 1
--exec echo "sleep ;" | $MYSQL_TEST 2>&1