From feb41b3a9ec30c3d192d7243d0b53408fa806460 Mon Sep 17 00:00:00 2001
From: "bar@mysql.com/bar.intranet.mysql.r18.ru" <>
Date: Wed, 6 Sep 2006 10:06:03 +0500
Subject: [PATCH] Adding a new test for bug N17939

---
 mysql-test/r/mysql.result | 10 ++++++++++
 mysql-test/t/mysql.test   |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index 99633f5e12a..9e8caf7ef8e 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                         |
 +------+------+---------------------------+
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test
index cf4e6f4047c..c768c0e6bbc 100644
--- a/mysql-test/t/mysql.test
+++ b/mysql-test/t/mysql.test
@@ -62,6 +62,12 @@ drop table t1;
 #
 --exec $MYSQL -t test -e "create table t1 (col1 binary(4), col2 varchar(10), col3 int); insert into t1 values ('a', 'b', 123421),('a ', '0123456789', 4), ('abcd', '', 4); select concat('>',col1,'<'), col2, col3 from t1; drop table t1;" 2>&1
 
+#
+# Bug#17939 Wrong table format when using UTF8 strings
+#
+--exec $MYSQL --default-character-set=utf8 --table -e "SELECT 'John Doe' as '__tañgè Ñãmé'" 2>&1
+--exec $MYSQL --default-character-set=utf8 --table -e "SELECT '__tañgè Ñãmé' as 'John Doe'" 2>&1
+
 #
 # Bug#18265 -- mysql client: No longer right-justifies numeric columns
 #