diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2015-04-02 20:46:21 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2015-06-30 13:17:09 +0300 |
| commit | edff3f3fa91eb0433d94385cbe119e62c4a2afdb (patch) | |
| tree | 798be12a38120cf4d269620667aba70cbbbd5044 /sql/log_event.cc | |
| parent | 724d5ae5f13d1414a0d4149918547ae50556b894 (diff) | |
| download | mariadb-git-edff3f3fa91eb0433d94385cbe119e62c4a2afdb.tar.gz | |
[MDEV-6877] Update Update, Delete and Write row log event
The row events no longer require columns arguments.
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 7594a6f7f10..cbf819dec2a 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -11117,9 +11117,9 @@ void Table_map_log_event::print(FILE *, PRINT_EVENT_INFO *print_event_info) #if !defined(MYSQL_CLIENT) Write_rows_log_event::Write_rows_log_event(THD *thd_arg, TABLE *tbl_arg, ulong tid_arg, - MY_BITMAP const *cols, bool is_transactional) - : Rows_log_event(thd_arg, tbl_arg, tid_arg, cols, is_transactional, WRITE_ROWS_EVENT_V1) + : Rows_log_event(thd_arg, tbl_arg, tid_arg, tbl_arg->write_set, + is_transactional, WRITE_ROWS_EVENT_V1) { } #endif @@ -12131,9 +12131,9 @@ end: #ifndef MYSQL_CLIENT Delete_rows_log_event::Delete_rows_log_event(THD *thd_arg, TABLE *tbl_arg, - ulong tid, MY_BITMAP const *cols, - bool is_transactional) - : Rows_log_event(thd_arg, tbl_arg, tid, cols, is_transactional, DELETE_ROWS_EVENT_V1) + ulong tid, bool is_transactional) + : Rows_log_event(thd_arg, tbl_arg, tid, tbl_arg->read_set, is_transactional, + DELETE_ROWS_EVENT_V1) { } #endif /* #if !defined(MYSQL_CLIENT) */ @@ -12261,21 +12261,11 @@ uint8 Delete_rows_log_event::get_trg_event_map() #if !defined(MYSQL_CLIENT) Update_rows_log_event::Update_rows_log_event(THD *thd_arg, TABLE *tbl_arg, ulong tid, - MY_BITMAP const *cols_bi, - MY_BITMAP const *cols_ai, - bool is_transactional) -: Rows_log_event(thd_arg, tbl_arg, tid, cols_bi, is_transactional, UPDATE_ROWS_EVENT_V1) -{ - init(cols_ai); -} - -Update_rows_log_event::Update_rows_log_event(THD *thd_arg, TABLE *tbl_arg, - ulong tid, - MY_BITMAP const *cols, bool is_transactional) -: Rows_log_event(thd_arg, tbl_arg, tid, cols, is_transactional, UPDATE_ROWS_EVENT_V1) +: Rows_log_event(thd_arg, tbl_arg, tid, tbl_arg->read_set, is_transactional, + UPDATE_ROWS_EVENT_V1) { - init(cols); + init(tbl_arg->write_set); } void Update_rows_log_event::init(MY_BITMAP const *cols) |