diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2014-04-15 18:08:33 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2014-04-15 18:08:33 +0500 |
| commit | 7d1033115a5c04a30a9a044ceb8f71047162d200 (patch) | |
| tree | d73836be955a8238c62ea6f8163fc013d6073a11 /libmysqld | |
| parent | 05722f06b212f0229dbc541b3d370319712d156a (diff) | |
| download | mariadb-git-7d1033115a5c04a30a9a044ceb8f71047162d200.tar.gz | |
MDEV-5138 Numerous test failures in "mtr --ps --embedded".
The function Protocol::net_store_data(a, b, CHARSET_A, CHARSET_B) should
be adapted to be working in the embedded server as it's done
with the Protocol::net_store_data(a, b).
That new function renamed as net_store_data_cs, so we can make it
virtual.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 8d694a4a308..2e5a35cda5e 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -1238,7 +1238,7 @@ bool Protocol::net_store_data(const uchar *from, size_t length) } -bool Protocol::net_store_data(const uchar *from, size_t length, +bool Protocol::net_store_data_cs(const uchar *from, size_t length, CHARSET_INFO *from_cs, CHARSET_INFO *to_cs) { uint conv_length= to_cs->mbmaxlen * length / from_cs->mbminlen; |