Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
98d4ea5b
Commit
98d4ea5b
authored
Sep 18, 2006
by
rburnett@bk-internal.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
parents
d8e27606
7a1798b1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
1 deletion
+17
-1
mysql-test/r/mysql.result
mysql-test/r/mysql.result
+10
-0
mysql-test/t/mysql.test
mysql-test/t/mysql.test
+6
-0
sql/sql_show.cc
sql/sql_show.cc
+1
-1
No files found.
mysql-test/r/mysql.result
View file @
98d4ea5b
...
...
@@ -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
View file @
98d4ea5b
...
...
@@ -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
View file @
98d4ea5b
...
...
@@ -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
}
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment