diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-05-17 15:27:10 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-05-17 15:27:10 +0400 |
| commit | e7ff281d2e954f9ab7f08a3e1a425a3c59e8f796 (patch) | |
| tree | e8e3903a609daef952785e28e5c876bafd52ba7b /sql/sys_vars.ic | |
| parent | 7e66a24dfb381290d59786c36e1dc478ad365bd1 (diff) | |
| download | mariadb-git-e7ff281d2e954f9ab7f08a3e1a425a3c59e8f796.tar.gz | |
MDEV-6353 my_ismbchar() and my_mbcharlen() refactoring
Diffstat (limited to 'sql/sys_vars.ic')
| -rw-r--r-- | sql/sys_vars.ic | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sql/sys_vars.ic b/sql/sys_vars.ic index 373f5834838..2488e804310 100644 --- a/sql/sys_vars.ic +++ b/sql/sys_vars.ic @@ -1434,6 +1434,9 @@ public: }; #if defined(ENABLED_DEBUG_SYNC) + +#include "debug_sync.h" + /** The class for @@debug_sync session-only variable */ @@ -1462,15 +1465,19 @@ public: String str(buff, sizeof(buff), system_charset_info), *res; if (!(res=var->value->val_str(&str))) - var->save_result.string_value.str= const_cast<char*>(""); + var->save_result.string_value= empty_lex_str; else - var->save_result.string_value.str= thd->strmake(res->ptr(), res->length()); + { + if (!thd->make_lex_string(&var->save_result.string_value, + res->ptr(), res->length())) + return true; + } return false; } bool session_update(THD *thd, set_var *var) { - extern bool debug_sync_update(THD *thd, char *val_str); - return debug_sync_update(thd, var->save_result.string_value.str); + return debug_sync_update(thd, var->save_result.string_value.str, + var->save_result.string_value.length); } bool global_update(THD *thd, set_var *var) { @@ -1488,7 +1495,6 @@ public: } uchar *session_value_ptr(THD *thd, const LEX_STRING *base) { - extern uchar *debug_sync_value_ptr(THD *thd); return debug_sync_value_ptr(thd); } uchar *global_value_ptr(THD *thd, const LEX_STRING *base) |