diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-26 09:42:33 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-26 09:42:33 +0100 |
| commit | 218280bcd76eb8cbe083157433d709ff7a0e3580 (patch) | |
| tree | be2d0157628b7059a309243fe625e36653926c8e /sql/item.cc | |
| parent | c73a0638c233f421bc17705d94e934d8fccfbe19 (diff) | |
| download | mariadb-git-218280bcd76eb8cbe083157433d709ff7a0e3580.tar.gz | |
make append_query_string() more usable:
simplify the prototype and move it to sql_string.h
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item.cc b/sql/item.cc index 0fbd58567ef..8b2b09c68d3 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -41,7 +41,6 @@ // REPORT_EXCEPT_NOT_FOUND, // find_item_in_list, // RESOLVED_AGAINST_ALIAS, ... -#include "log_event.h" // append_query_string #include "sql_expression_cache.h" const String my_null_string("NULL", 4, default_charset_info); @@ -3749,8 +3748,9 @@ const String *Item_param::query_val_str(THD *thd, String* str) const case LONG_DATA_VALUE: { str->length(0); - append_query_string(thd, value.cs_info.character_set_client, &str_value, - str); + append_query_string(value.cs_info.character_set_client, str, + str_value.ptr(), str_value.length(), + thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES); break; } case NULL_VALUE: |