diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-08 12:45:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-08 12:45:08 +0300 |
| commit | 2d8fdfbde5d5d32df64bacfaa7574ecf83b0bc03 (patch) | |
| tree | cea7cfc27b7f5c3c9d116a82330fef01350b08f4 /sql/log_event.cc | |
| parent | c4cbc7a8807250d2d5b5938b218fd9c423a0b30a (diff) | |
| parent | fbeb9489cd7d6ad859a49ae5ab8f876f3d988470 (diff) | |
| download | mariadb-git-2d8fdfbde5d5d32df64bacfaa7574ecf83b0bc03.tar.gz | |
Merge 10.1 into 10.2
Replace have_innodb_zip.inc with innodb_page_size_small.inc.
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 406b14cc2a9..6ff0211e536 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -8402,7 +8402,6 @@ int Xid_log_event::do_apply_event(rpl_group_info *rgi) consistent. */ #ifdef WITH_WSREP - /*Set wsrep_affected_rows = 0 */ thd->wsrep_affected_rows= 0; #endif |