diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-08-24 12:32:46 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-08-24 12:32:46 +0200 |
| commit | 96703a63da2211cefcc480fa4f135acd94743622 (patch) | |
| tree | a95df690fd2ca5cf82947213f2da5ad653fc26c1 /sql/log.cc | |
| parent | 60561ae6133cf40f4fc445e1d6e8f395a20b2573 (diff) | |
| parent | cdeabcfd436c65e0a97e74b1722d0259ba907541 (diff) | |
| download | mariadb-git-96703a63da2211cefcc480fa4f135acd94743622.tar.gz | |
Merge from 5.1.
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 4e42298a03c..86599a58833 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -38,6 +38,7 @@ #endif #include <mysql/plugin.h> +#include "sql_show.h" /* max size of the log message */ #define MAX_LOG_BUFFER_SIZE 1024 @@ -1769,9 +1770,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 == THD::NOT_KILLED); Query_log_event qinfo(thd, log_query.ptr(), log_query.length(), @@ -1793,9 +1793,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 == THD::NOT_KILLED); Query_log_event qinfo(thd, log_query.ptr(), log_query.length(), |