diff options
| author | unknown <paul@snake-hub.snake.net> | 2006-02-28 15:14:31 -0600 |
|---|---|---|
| committer | unknown <paul@snake-hub.snake.net> | 2006-02-28 15:14:31 -0600 |
| commit | 560f40b69f2a17a86c74328c3bab671c96f10c0d (patch) | |
| tree | c67873ac2879a385c4cc315efe932d861a6f01ee /mysql-test/r | |
| parent | f6d7a36a053ce94f15441232f94b06fc22f2ec51 (diff) | |
| parent | 618bd0a5e5eab89206f93d7f459ebbccc8e8237f (diff) | |
| download | mariadb-git-560f40b69f2a17a86c74328c3bab671c96f10c0d.tar.gz | |
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
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 432c3dfc9b9..169eb5424f9 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -296,7 +296,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 |