diff options
| author | unknown <msvensson@pilot.(none)> | 2007-08-08 16:47:35 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-08-08 16:47:35 +0200 |
| commit | c9338ec6bd2081c8be86f28176b510fbacfd034d (patch) | |
| tree | eec19be0339aefa1dd223397f079ef4d1bfc7edb /mysql-test/r/mysqltest.result | |
| parent | f1da5af32abe948f55a651eb631ec1e0cb48d683 (diff) | |
| parent | 395d9167b152b8bd8783015d577186b089c34b1e (diff) | |
| download | mariadb-git-c9338ec6bd2081c8be86f28176b510fbacfd034d.tar.gz | |
Merge 192.168.0.7:mysql/mysql-5.0-maint
into pilot.(none):/data/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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 97747987110..ba62936999e 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -533,6 +533,7 @@ 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 +Content for test_file1 mysqltest: At line 1: File already exist: 'MYSQLTEST_VARDIR/tmp/test_file1.tmp' Some data for cat_file command |