diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-04-19 11:07:19 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-04-19 11:07:19 +0500 |
| commit | b14a8f8dce623afa31ec2ebc02d8a5b014949e13 (patch) | |
| tree | 8babc6c834f707a05f1f349fdc526a440198b251 /mysql-test/r/mysql.result | |
| parent | 74192cf9840bd461375c1cff60eb6a686c381657 (diff) | |
| parent | be90800c9f7fed4fdae2acfa12f2ea369eeb07e7 (diff) | |
| download | mariadb-git-b14a8f8dce623afa31ec2ebc02d8a5b014949e13.tar.gz | |
Merge mysql.com:/home/ram/work/b26851/b26851.5.0
into mysql.com:/home/ram/work/b26851/b26851.5.1
client/mysql.cc:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
Diffstat (limited to 'mysql-test/r/mysql.result')
| -rw-r--r-- | mysql-test/r/mysql.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index 61d04deef51..d5741f437a5 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -174,4 +174,8 @@ ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyrils_superlonghostnam 1 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 |