database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk-internal.mysql.com:/data0/bk/mysql-5.0

Browse Source 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
This commit is contained in:
rburnett@bk-internal.mysql.com
2006-09-18 15:38:34 +02:00
parent d8e27606e1 7a1798b128
commit 98d4ea5b7a
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/mysql.result
View File

@ -76,6 +76,16 @@ c_cp932
| >a < | 0123456789 | 4 | | >a < | 0123456789 | 4 |
| >abcd< | | 4 | | >abcd< | | 4 |
+----------------------+------------+--------+ +----------------------+------------+--------+
+-------------------+
| __tañgè Ñãmé |
+-------------------+
| John Doe |
+-------------------+
+-------------------+
| John Doe |
+-------------------+
| __tañgè Ñãmé |
+-------------------+
+------+------+---------------------------+ +------+------+---------------------------+
| i | j | k | | i | j | k |
+------+------+---------------------------+ +------+------+---------------------------+

6
mysql-test/t/mysql.test
View File

@ -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 --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 # Bug#18265 -- mysql client: No longer right-justifies numeric columns
# #

2
sql/sql_show.cc
View File

@ -4277,7 +4277,7 @@ ST_FIELD_INFO triggers_fields_info[]=
ST_FIELD_INFO variables_fields_info[]= ST_FIELD_INFO variables_fields_info[]=
{ {
{"Variable_name", 80, MYSQL_TYPE_STRING, 0, 0, "Variable_name"}, {"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} {0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
}; };