diff options
| author | msvensson@pilot.blaudden <> | 2007-04-23 13:28:09 +0200 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-04-23 13:28:09 +0200 |
| commit | b941ef86330a77d2a52375f766abf6490ad414d0 (patch) | |
| tree | 7ca90ebe182071ccac4a6a097cc383cbf75300e0 /mysql-test/r/mysql.result | |
| parent | f5245757e133f115bf6dd8b7e82a9ee7db1f3ce0 (diff) | |
| parent | 7ddc33753ec338969a205e5ff9904d74ccb973c7 (diff) | |
| download | mariadb-git-b941ef86330a77d2a52375f766abf6490ad414d0.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
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 |