diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-02-19 18:20:33 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-02-19 18:20:33 +0100 |
| commit | 8cb50382d4d71ccf77170a07d582a26e6154c3a8 (patch) | |
| tree | 255235c7225a8962cf071a2b82c92a971691d0ce /mysql-test/r/mysqltest.result | |
| parent | 2b46c20a7d722c3654d5bf219a837a28c84cc1b3 (diff) | |
| parent | 8d7e8d971580c4b35d49e9dcb7b27834ff29fd7e (diff) | |
| download | mariadb-git-8cb50382d4d71ccf77170a07d582a26e6154c3a8.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
client/mysqltest.c:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/r/mysqltest.result:
SCCS merged
Diffstat (limited to 'mysql-test/r/mysqltest.result')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 3ecafcab8a4..e60ed391c0a 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -516,6 +516,10 @@ drop table t1; mysqltest: At line 1: Missing required argument 'filename' to command 'remove_file' mysqltest: At line 1: Missing required argument 'filename' to command 'write_file' mysqltest: At line 1: End of file encountered before 'EOF' delimiter was found +Some data +for cat_file command +of mysqltest +mysqltest: At line 1: Failed to open file non_existing_file mysqltest: At line 1: Missing required argument 'filename' to command 'file_exists' mysqltest: At line 1: Missing required argument 'from_file' to command 'copy_file' mysqltest: At line 1: Missing required argument 'to_file' to command 'copy_file' |