diff options
| author | jpipes@shakedown.(none) <> | 2006-11-27 14:58:57 -0500 |
|---|---|---|
| committer | jpipes@shakedown.(none) <> | 2006-11-27 14:58:57 -0500 |
| commit | 03a5dcd7ce51e12de9a1e2224ad0e4f3ea4d5f20 (patch) | |
| tree | 8000ea4cede29d098cc2e485d08d1f337ec4fa9f /mysql-test/r/mysql.result | |
| parent | 699898c82c34a273721e54b1eaac24e75acd2e2c (diff) | |
| parent | b57051381a4dbd7c7f933b28582c496047e2f139 (diff) | |
| download | mariadb-git-03a5dcd7ce51e12de9a1e2224ad0e4f3ea4d5f20.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
Diffstat (limited to 'mysql-test/r/mysql.result')
| -rw-r--r-- | mysql-test/r/mysql.result | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index 7fd55351880..cfcb3eaf334 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -61,16 +61,16 @@ database() test unlock tables; drop table t1; -ソ -ソ +ﾂソ +ﾂソ c_cp932 -ソ -ソ -ソ +ﾂソ +ﾂソ +ﾂソ 繧ｽ 繧ｽ -ソ -ソ +ﾂソ +ﾂソ +----------------------+------------+--------+ | concat('>',col1,'<') | col2 | col3 | +----------------------+------------+--------+ @@ -180,4 +180,8 @@ Too long dbname ERROR 1049 (42000) at line 1: Unknown database 'test_really_long_dbnamexxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' Too long hostname ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyrils_superlonghostnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno) +1 +1 +ERROR at line 1: DELIMITER cannot contain a backslash character +ERROR at line 1: DELIMITER cannot contain a backslash character End of 5.0 tests |