diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-08-24 14:02:32 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-08-24 14:02:32 +0200 |
| commit | fc666a0df6c69a620d3cffacd78e2569fb0ac410 (patch) | |
| tree | a956401c47c0464ad21f91d7e864af1ab89e0469 /sql/log.cc | |
| parent | e44a800d91a887119d3b612276b37f09b076fee1 (diff) | |
| parent | 96703a63da2211cefcc480fa4f135acd94743622 (diff) | |
| download | mariadb-git-fc666a0df6c69a620d3cffacd78e2569fb0ac410.tar.gz | |
merge from 5.2
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sql/log.cc b/sql/log.cc index 7c25de96365..0c954744041 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -39,6 +39,7 @@ #include <mysql/plugin.h> #include "debug_sync.h" +#include "sql_show.h" /* max size of the log message */ #define MAX_LOG_BUFFER_SIZE 1024 @@ -1794,9 +1795,8 @@ static int binlog_savepoint_set(handlerton *hton, THD *thd, void *sv) String log_query; if (log_query.append(STRING_WITH_LEN("SAVEPOINT ")) || - log_query.append("`") || - log_query.append(thd->lex->ident.str, thd->lex->ident.length) || - log_query.append("`")) + append_identifier(thd, &log_query, + thd->lex->ident.str, thd->lex->ident.length)) DBUG_RETURN(1); int errcode= query_error_code(thd, thd->killed == NOT_KILLED); Query_log_event qinfo(thd, log_query.ptr(), log_query.length(), @@ -1818,9 +1818,8 @@ static int binlog_savepoint_rollback(handlerton *hton, THD *thd, void *sv) { String log_query; if (log_query.append(STRING_WITH_LEN("ROLLBACK TO ")) || - log_query.append("`") || - log_query.append(thd->lex->ident.str, thd->lex->ident.length) || - log_query.append("`")) + append_identifier(thd, &log_query, + thd->lex->ident.str, thd->lex->ident.length)) DBUG_RETURN(1); int errcode= query_error_code(thd, thd->killed == NOT_KILLED); Query_log_event qinfo(thd, log_query.ptr(), log_query.length(), |