Commit bbe04de6 authored by unknown's avatar unknown
Browse files

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
parents 24cdd480 48d840b0

mysql-test/r/mysql.result

+10 −0
Original line number Diff line number Diff line
@@ -76,6 +76,16 @@ c_cp932 
| >a   <               | 0123456789 |      4 | 

| >abcd<               |            |      4 | 

+----------------------+------------+--------+

+-------------------+

| __tañgè Ñãmé      |

+-------------------+

| John Doe          | 

+-------------------+

+-------------------+

| John Doe          |

+-------------------+

| __tañgè Ñãmé      | 

+-------------------+

+------+------+---------------------------+

| i    | j    | k                         |

+------+------+---------------------------+

mysql-test/t/mysql.test

+6 −0
Original line number Diff line number Diff line
@@ -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

#

sql/sql_show.cc

+1 −1
Original line number Diff line number Diff line
@@ -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}

};