diff options
| author | unknown <msvensson@pilot.(none)> | 2007-08-07 11:42:14 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-08-07 11:42:14 +0200 |
| commit | d513e1ef50c580954f49c2230259a4647379c2fd (patch) | |
| tree | 0bad5fb4b1dc6128c97876c40451ad1fe3ad9ccf /mysql-test/r | |
| parent | d3b0bed19730892300bbc6fa7f6c1ebceadfc67d (diff) | |
| parent | 04e8c93c20a5517cfd57ef71ea91a3cea531828b (diff) | |
| download | mariadb-git-d513e1ef50c580954f49c2230259a4647379c2fd.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysqladmin.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/sp-destruct.test:
Auto merged
client/mysqltest.c:
Manual merge
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 7fa23648c0a..1925d58c4f1 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -521,6 +521,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 +mysqltest: At line 1: File already exist: 'MYSQLTEST_VARDIR/tmp/test_file1.tmp' Some data for cat_file command of mysqltest @@ -531,7 +532,7 @@ mysqltest: At line 1: Missing required argument 'to_file' to command 'copy_file' mysqltest: At line 1: Missing required argument 'mode' to command 'chmod' mysqltest: At line 1: You must write a 4 digit octal number for mode mysqltest: At line 1: You must write a 4 digit octal number for mode -mysqltest: At line 1: Missing required argument 'file' to command 'chmod' +mysqltest: At line 1: Missing required argument 'filename' to command 'chmod' mysqltest: At line 1: You must write a 4 digit octal number for mode mysqltest: At line 1: You must write a 4 digit octal number for mode hello |