diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-11-30 20:20:26 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-11-30 20:20:26 +0200 |
| commit | 184d7b0250da10e685d2c3f12a69f8a58d1f39cf (patch) | |
| tree | 2d1788c10fb236cceb33b0b073390568b163d0fb /sql/sql_delete.cc | |
| parent | 558feaa2087397d43a48116743dcdaee9558485e (diff) | |
| parent | 3962da934f6e2a92ba04505bd6a33dd7d8322005 (diff) | |
| download | mariadb-git-184d7b0250da10e685d2c3f12a69f8a58d1f39cf.tar.gz | |
mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on the next step
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 299b0690cd4..1aa7d426814 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -414,7 +414,7 @@ cleanup: therefore be treated as a DDL. */ int log_result= thd->binlog_query(query_type, - thd->query, thd->query_length, + thd->query(), thd->query_length(), is_trans, FALSE, FALSE, errcode); if (log_result) @@ -839,7 +839,7 @@ void multi_delete::abort() { int errcode= query_error_code(thd, thd->killed == THD::NOT_KILLED); thd->binlog_query(THD::ROW_QUERY_TYPE, - thd->query, thd->query_length, + thd->query(), thd->query_length(), transactional_tables, FALSE, FALSE, errcode); } } @@ -1015,7 +1015,7 @@ bool multi_delete::send_eof() else errcode= query_error_code(thd, killed_status == THD::NOT_KILLED); if (thd->binlog_query(THD::ROW_QUERY_TYPE, - thd->query, thd->query_length, + thd->query(), thd->query_length(), transactional_tables, FALSE, FALSE, errcode) && !normal_tables) { @@ -1156,7 +1156,7 @@ end: TRUNCATE must always be statement-based binlogged (not row-based) so we don't test current_stmt_binlog_format. */ - write_bin_log(thd, TRUE, thd->query, thd->query_length); + write_bin_log(thd, TRUE, thd->query(), thd->query_length()); my_ok(thd); // This should return record count } VOID(pthread_mutex_lock(&LOCK_open)); |