diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-23 13:28:09 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-23 13:28:09 +0200 |
| commit | 6e5abcaf038c04efcf5c0263e29136d546a93b3a (patch) | |
| tree | 7ca90ebe182071ccac4a6a097cc383cbf75300e0 /mysql-test/r/mysql.result | |
| parent | 361649b90668b4cc118767d5bdd9efc69b4c5677 (diff) | |
| parent | 09e6e6618ffb744899d6a45ae8987412cea51cdb (diff) | |
| download | mariadb-git-6e5abcaf038c04efcf5c0263e29136d546a93b3a.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
Makefile.am:
Auto merged
client/mysql_upgrade.c:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
sql/mysql_priv.h:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'mysql-test/r/mysql.result')
| -rw-r--r-- | mysql-test/r/mysql.result | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index d5741f437a5..57e1f2e4ef6 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -176,6 +176,4 @@ ERROR at line 1: DELIMITER cannot contain a backslash character ERROR at line 1: DELIMITER cannot contain a backslash character 1 1 -1 -1 End of 5.0 tests |