diff options
| author | unknown <msvensson@pilot.(none)> | 2007-06-19 11:07:39 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-06-19 11:07:39 +0200 |
| commit | 8d04d7bba13dd113cac834b3d3fa6f782ed96123 (patch) | |
| tree | d9577b4c787cd68197015fde0ec633c1eedbc388 /mysql-test/r | |
| parent | 9cb0a84c7e475302350d64ffd33cb8e61a25737e (diff) | |
| parent | 9aac6fd7bd5be2e77694bc4e438ff12e862067f0 (diff) | |
| download | mariadb-git-8d04d7bba13dd113cac834b3d3fa6f782ed96123.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/wl3232/my41-wl3232
into pilot.(none):/data/msvensson/mysql/wl3232/my50-wl3232
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 1 |
1 files changed, 1 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" |