summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqltest.result
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.(none)>2007-06-01 15:43:04 +0200
committerunknown <msvensson@pilot.(none)>2007-06-01 15:43:04 +0200
commitc73e0cfb6022945a5b0411b740f51e0f931a9d07 (patch)
tree82b8f2aeabc56af2d35ef10d252b2d931791dfd5 /mysql-test/r/mysqltest.result
parent7816d02ef7fb4414c5ff9b9654c6e0468c9b2c66 (diff)
parent7ff06317a44b700226a64ae5a0f2ab5d2433b9a0 (diff)
downloadmariadb-git-c73e0cfb6022945a5b0411b740f51e0f931a9d07.tar.gz
Merge pilot.(none):/data/msvensson/mysql/bug28373/my50-bug28373
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint mysql-test/r/mysqltest.result: Auto merged mysql-test/t/mysqltest.test: Auto merged
Diffstat (limited to 'mysql-test/r/mysqltest.result')
-rw-r--r--mysql-test/r/mysqltest.result1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index 389f20e0407..6f283677bf7 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -410,7 +410,6 @@ mysqltest: At line 1: Wrong column number to replace_column in 'replace_column a
mysqltest: At line 1: Wrong column number to replace_column in 'replace_column a 1'
mysqltest: At line 1: Wrong column number to replace_column in 'replace_column 1 b c '
mysqltest: At line 1: Invalid integer argument "10!"
-mysqltest: At line 1: End of line junk detected: "!"
mysqltest: At line 1: Invalid integer argument "a"
mysqltest: At line 1: Missing required argument 'connection name' to command 'connect'
mysqltest: At line 1: Missing required argument 'connection name' to command 'connect'