summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <gluh@mysql.com/gluh.(none)>2006-10-05 13:41:58 +0500
committerunknown <gluh@mysql.com/gluh.(none)>2006-10-05 13:41:58 +0500
commit8f3322529520cd223c7d87318b4199e09d6ac2fc (patch)
tree3d93ebd737d5fdd7c5620d9b6ed8f39c05db3d41 /mysql-test/r
parent9cd171e2dc8743f96c710039e7348426e9bff045 (diff)
parentbbe04de62d05888b68b9eccd8dbca34e31ea27a3 (diff)
downloadmariadb-git-8f3322529520cd223c7d87318b4199e09d6ac2fc.tar.gz
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/mysql.result10
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 |
+------+------+---------------------------+