summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqltest.result
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/r/mysqltest.result
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/r/mysqltest.result')
-rw-r--r--mysql-test/r/mysqltest.result13
1 files changed, 8 insertions, 5 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index 79341b30f7a..67c08b0ae97 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -147,9 +147,10 @@ hello
hello
;;;;;;;;
# MySQL: -- The
-mysqltest: At line 1: End of line junk detected: "6"
-mysqltest: At line 1: End of line junk detected: "6"
-mysqltest: At line 1: Missing delimiter
+mysqltest: At line 1: Extra argument '6' passed to 'sleep'
+mysqltest: At line 1: Extra argument '6' passed to 'sleep'
+mysqltest: At line 1: Extra argument 'A comment
+show status' passed to 'sleep'
mysqltest: At line 1: End of line junk detected: "sleep 7
# Another comment
"
@@ -354,8 +355,10 @@ here is the sourced script
here is the sourced script
"hello"
"hello"
-mysqltest: At line 1: Missing argument to sleep
-mysqltest: At line 1: Missing argument to real_sleep
+mysqltest: At line 2: Invalid argument to sleep "xyz"
+mysqltest: At line 2: Invalid argument to real_sleep "xyz"
+mysqltest: At line 1: Missing required argument 'sleep_delay' to command 'sleep'
+mysqltest: At line 1: Missing required argument 'sleep_delay' to command 'real_sleep'
mysqltest: At line 1: Invalid argument to sleep "abc"
mysqltest: At line 1: Invalid argument to real_sleep "abc"
1