diff options
| author | rburnett@bk-internal.mysql.com <> | 2006-09-18 15:38:34 +0200 |
|---|---|---|
| committer | rburnett@bk-internal.mysql.com <> | 2006-09-18 15:38:34 +0200 |
| commit | 98d4ea5b7a9cfdff6d2c5783216142dedd49dde5 (patch) | |
| tree | be043cdbd6d38dce102298d6e6b0f841067ae0a2 | |
| parent | d8e27606e1716d674ce03588cb8e763fbc260b62 (diff) | |
| parent | 7a1798b1283724a48232176a6f33409218e532df (diff) | |
| download | mariadb-git-98d4ea5b7a9cfdff6d2c5783216142dedd49dde5.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
| -rw-r--r-- | mysql-test/r/mysql.result | 10 | ||||
| -rw-r--r-- | mysql-test/t/mysql.test | 6 | ||||
| -rw-r--r-- | sql/sql_show.cc | 2 |
3 files changed, 17 insertions, 1 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 | +------+------+---------------------------+ diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 9e3eabf474b..f3296e6f706 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -63,6 +63,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 # --exec $MYSQL -t --default-character-set utf8 test -e "create table t1 (i int, j int, k char(25) charset utf8); insert into t1 (i) values (1); insert into t1 (k) values ('<----------------------->'); insert into t1 (k) values ('<-----'); insert into t1 (k) values ('Τη γλώσσα'); insert into t1 (k) values ('ᛖᚴ ᚷᛖᛏ'); select * from t1; DROP TABLE t1;" diff --git a/sql/sql_show.cc b/sql/sql_show.cc index eb78f4fbdae..4469bbacf90 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -4277,7 +4277,7 @@ ST_FIELD_INFO triggers_fields_info[]= ST_FIELD_INFO variables_fields_info[]= { {"Variable_name", 80, MYSQL_TYPE_STRING, 0, 0, "Variable_name"}, - {"Value", 255, MYSQL_TYPE_STRING, 0, 0, "Value"}, + {"Value", FN_REFLEN, MYSQL_TYPE_STRING, 0, 0, "Value"}, {0, 0, MYSQL_TYPE_STRING, 0, 0, 0} }; |