diff options
| author | Alfranio Correia <alfranio.correia@oracle.com> | 2010-09-17 14:55:23 +0100 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@oracle.com> | 2010-09-17 14:55:23 +0100 |
| commit | 0c74cc0d1097c51e9e54c6e0fb1550e4d3df84c7 (patch) | |
| tree | 87558c61c50cd75ec5a9506ae136c9f83a859805 /sql | |
| parent | 31a38c0fc5de01055183f642ce171b2f47d377f0 (diff) | |
| parent | afff01687bbad18f62ee30609c7b9500bbb4aede (diff) | |
| download | mariadb-git-0c74cc0d1097c51e9e54c6e0fb1550e4d3df84c7.tar.gz | |
merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index 156c293e3aa..503b3bb5cff 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1712,7 +1712,9 @@ 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(thd->lex->ident.str, thd->lex->ident.length)) + log_query.append("`") || + log_query.append(thd->lex->ident.str, thd->lex->ident.length) || + log_query.append("`")) 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(), @@ -1734,7 +1736,9 @@ 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(thd->lex->ident.str, thd->lex->ident.length)) + log_query.append("`") || + log_query.append(thd->lex->ident.str, thd->lex->ident.length) || + log_query.append("`")) 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(), |