database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

mysql-5.5.38 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2014-06-03 09:55:08 +02:00
parent 2d687cad5d c1fd09f3d4
commit 5d16592d44
29 changed files with 529 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_string.h
View File

@@ -322,6 +322,9 @@ public:
static bool needs_conversion(uint32 arg_length,
CHARSET_INFO *cs_from, CHARSET_INFO *cs_to,
uint32 *offset);
static bool needs_conversion_on_storage(uint32 arg_length,
CHARSET_INFO *cs_from,
CHARSET_INFO *cs_to);
bool copy_aligned(const char *s, uint32 arg_length, uint32 offset,
CHARSET_INFO *cs);
bool set_or_copy_aligned(const char *s, uint32 arg_length, CHARSET_INFO *cs);