diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-06-06 00:07:27 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-06-06 00:07:27 +0200 |
| commit | e27c338634739ef56a6888e7948e04c0fa0ba677 (patch) | |
| tree | ad63ccae614f3dd77509825d1905fd815ef322cb /sql/sql_string.h | |
| parent | 2a5905141a3c509a7c34c3d370fb146dbc1c965f (diff) | |
| parent | 6d75570e99fbf070cdbeefdfbcfc94d1c7b3ad1f (diff) | |
| download | mariadb-git-e27c338634739ef56a6888e7948e04c0fa0ba677.tar.gz | |
5.5.38 merge
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index bc9e7f11bd6..95c82518f9e 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -343,6 +343,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); |