diff options
| author | msvensson@pilot.(none) <> | 2007-06-19 11:07:39 +0200 |
|---|---|---|
| committer | msvensson@pilot.(none) <> | 2007-06-19 11:07:39 +0200 |
| commit | 6c22726ebdebb03552081c1b1d1697582f82dbd8 (patch) | |
| tree | d9577b4c787cd68197015fde0ec633c1eedbc388 /mysql-test | |
| parent | 36ae2387a91898b66fc31fe160ff2ad3cc43f5de (diff) | |
| parent | caebb719b23db45c99225f18215c1fd383ce4f9d (diff) | |
| download | mariadb-git-6c22726ebdebb03552081c1b1d1697582f82dbd8.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/wl3232/my41-wl3232
into pilot.(none):/data/msvensson/mysql/wl3232/my50-wl3232
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/mysqltest.test | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 6f283677bf7..8cf5f99dca3 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -339,6 +339,7 @@ here is the sourced script In loop here is the sourced script +here is the sourced script mysqltest: At line 1: Missing argument to sleep mysqltest: At line 1: Missing argument to real_sleep mysqltest: At line 1: Invalid argument to sleep "abc" diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index d7c9945fe18..b7bb0a6687a 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -835,6 +835,10 @@ while ($num) } --enable_abort_on_error --enable_query_log + +# Test source $variable/<filename> +--source $MYSQLTEST_VARDIR/tmp/sourced.inc + --remove_file $MYSQLTEST_VARDIR/tmp/sourced.inc # ---------------------------------------------------------------------------- |