diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-08-24 10:34:55 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-08-24 10:34:55 +0200 |
| commit | 4997ddfa9e4399915091a2a726f3d043927c4118 (patch) | |
| tree | f0e977456b81554e03acd56307177d315fd75448 /sql/log.cc | |
| parent | 115a2967563d3ac734ce371260098710ba42cdf0 (diff) | |
| parent | cdeabcfd436c65e0a97e74b1722d0259ba907541 (diff) | |
| download | mariadb-git-4997ddfa9e4399915091a2a726f3d043927c4118.tar.gz | |
Merge with latest 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 732ce6326fc..4c21ac4c571 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 @@ -1726,9 +1727,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.c_ptr_safe(), log_query.length(), @@ -1750,9 +1750,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.c_ptr_safe(), log_query.length(), |