diff options
| author | unknown <paul@snake-hub.snake.net> | 2006-02-28 15:09:45 -0600 |
|---|---|---|
| committer | unknown <paul@snake-hub.snake.net> | 2006-02-28 15:09:45 -0600 |
| commit | 74ee3a125cbf236cc241d9fa791c2ed9df6f8dcc (patch) | |
| tree | c2cfe7e8d47acd67cf8960d8b0cbf0f13cc0f706 /mysql-test/r | |
| parent | 046530d5bc1a91131bbebaaab043486d5cb03988 (diff) | |
| parent | 8d5f0fcddcb7b3c5dd7d2f79dd04ba95c61779e9 (diff) | |
| download | mariadb-git-74ee3a125cbf236cc241d9fa791c2ed9df6f8dcc.tar.gz | |
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index de07021f217..9512a99e35e 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -297,7 +297,9 @@ here is the sourced script In loop 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" +mysqltest: At line 1: Invalid argument to real_sleep "abc" 1 2 101 |