diff options
| author | unknown <rburnett@bk-internal.mysql.com> | 2006-09-18 15:38:34 +0200 |
|---|---|---|
| committer | unknown <rburnett@bk-internal.mysql.com> | 2006-09-18 15:38:34 +0200 |
| commit | 9122f83da808789ce9624d7ed3d1495cdcde6889 (patch) | |
| tree | be043cdbd6d38dce102298d6e6b0f841067ae0a2 /mysql-test/r/mysql.result | |
| parent | 8a8a7c014c2a945f86de101fd272d47ee2783dc5 (diff) | |
| parent | 1a7ab81f1adc4516f894ef93c83a1806a6e41604 (diff) | |
| download | mariadb-git-9122f83da808789ce9624d7ed3d1495cdcde6889.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
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 | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index 7dbff4beca5..1053b1918fb 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -76,6 +76,16 @@ c_cp932 | >a < | 0123456789 | 4 | | >abcd< | | 4 | +----------------------+------------+--------+ ++-------------------+ +| __tañgè Ñãmé | ++-------------------+ +| John Doe | ++-------------------+ ++-------------------+ +| John Doe | ++-------------------+ +| __tañgè Ñãmé | ++-------------------+ +------+------+---------------------------+ | i | j | k | +------+------+---------------------------+ |