diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-02-19 18:24:32 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-02-19 18:24:32 +0100 |
| commit | 082ad73439226510e8c6c252342958ab47c8e91c (patch) | |
| tree | 9f1e7446779cf497bc8cf515bcf2f2b200c7acf3 | |
| parent | 8cb50382d4d71ccf77170a07d582a26e6154c3a8 (diff) | |
| parent | a8be1b932502013a552109adaf84062c4fdb4713 (diff) | |
| download | mariadb-git-082ad73439226510e8c6c252342958ab47c8e91c.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Manual merge
| -rw-r--r-- | mysql-test/r/mysqltest.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/mysqltest.test | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index e60ed391c0a..0b895afe910 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -210,7 +210,6 @@ source database "MySQL: The world's most popular ;open source database" echo message echo message -mysqltest: At line 1: Empty variable mysqltest: At line 1: command "false" failed mysqltest: At line 1: Missing argument in exec MySQL diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index a50d8b773ec..b5452d173f5 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -555,8 +555,8 @@ echo ; # Illegal use of echo ---error 1 ---exec echo "echo \$;" | $MYSQL_TEST 2>&1 +#--error 1 +#--exec echo "echo \$;" | $MYSQL_TEST 2>&1 # ---------------------------------------------------------------------------- |