diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-06-25 03:40:30 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-06-25 03:40:30 +0500 |
| commit | 362852ba801eb4fe9fd0c46941f1561a391088c0 (patch) | |
| tree | cc7610ed3772133691960cf0b1ee425bdaac69f8 /sql/sql_class.h | |
| parent | 81d32154d2814b38b68a9a8c8d4c3e27e337ad07 (diff) | |
| parent | 1ba9b0a9f192ff2e0b04781d6019aa181d4a10e9 (diff) | |
| download | mariadb-git-362852ba801eb4fe9fd0c46941f1561a391088c0.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.1
into gleb.loc:/home/uchum/work/bk/5.1-opt
sql/item.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_view.cc:
Auto merged
mysql-test/r/rpl_change_master.result:
Merge with 5.1.
mysql-test/t/rpl_change_master.test:
Merge with 5.1.
sql/sql_acl.cc:
Merge with 5.1.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 0f42a4c9988..c46adc62c7c 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1096,7 +1096,6 @@ public: Rows_log_event* binlog_get_pending_rows_event() const; void binlog_set_pending_rows_event(Rows_log_event* ev); int binlog_flush_pending_rows_event(bool stmt_end); - void binlog_delete_pending_rows_event(); private: uint binlog_table_maps; // Number of table maps currently in the binlog |