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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
10cb018b
Commit
10cb018b
authored
Jul 25, 2006
by
unknown
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
eaf279df
af3674cc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
libmysqld/lib_sql.cc
libmysqld/lib_sql.cc
+6
-2
tests/mysql_client_test.c
tests/mysql_client_test.c
+2
-0
No files found.
libmysqld/lib_sql.cc
View file @
10cb018b
...
...
@@ -890,10 +890,14 @@ bool Protocol::send_fields(List<Item> *list, uint flags)
}
else
{
uint
max_char_len
;
/* With conversion */
client_field
->
charsetnr
=
thd_cs
->
number
;
uint
char_len
=
server_field
.
length
/
item
->
collation
.
collation
->
mbmaxlen
;
client_field
->
length
=
char_len
*
thd_cs
->
mbmaxlen
;
max_char_len
=
(
server_field
.
type
>=
(
int
)
MYSQL_TYPE_TINY_BLOB
&&
server_field
.
type
<=
(
int
)
MYSQL_TYPE_BLOB
)
?
server_field
.
length
/
item
->
collation
.
collation
->
mbminlen
:
server_field
.
length
/
item
->
collation
.
collation
->
mbmaxlen
;
client_field
->
length
=
max_char_len
*
thd_cs
->
mbmaxlen
;
}
client_field
->
type
=
server_field
.
type
;
client_field
->
flags
=
server_field
.
flags
;
...
...
tests/mysql_client_test.c
View file @
10cb018b
...
...
@@ -15291,7 +15291,9 @@ static struct my_tests_st my_tests[]= {
{
"test_bug14845"
,
test_bug14845
},
{
"test_bug15510"
,
test_bug15510
},
{
"test_opt_reconnect"
,
test_opt_reconnect
},
#ifndef EMBEDDED_LIBRARY
{
"test_bug12744"
,
test_bug12744
},
#endif
{
"test_bug16143"
,
test_bug16143
},
{
"test_bug15613"
,
test_bug15613
},
{
"test_bug20152"
,
test_bug20152
},
...
...
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