diff options
author | Michael Widenius <monty@askmonty.org> | 2011-02-28 13:16:17 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2011-02-28 13:16:17 +0200 |
commit | dfcc0010cf7be502bfca31aff75ba830f6962264 (patch) | |
tree | 9e2bc4700a2db961d967e53f00c941f3ee501173 /sql/log_event.cc | |
parent | 572482f33878616d216639312779c23918c3d7b7 (diff) | |
parent | d32246f82ab213e04189d644e028beb2cc30cb32 (diff) | |
download | mariadb-git-dfcc0010cf7be502bfca31aff75ba830f6962264.tar.gz |
Merge with alias as String
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r-- | sql/log_event.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index fb4fc5b79b3..4a1ccc037a5 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -573,7 +573,7 @@ append_query_string(CHARSET_INFO *csinfo, if (to->reserve(orig_len + from->length()*2+3)) return 1; - beg= to->c_ptr_quick() + to->length(); + beg= (char*) to->ptr() + to->length(); ptr= beg; if (csinfo->escape_with_backslash_is_dangerous) ptr= str_to_hex(ptr, from->ptr(), from->length()); |