diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-09-25 09:49:39 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-09-25 12:04:40 +0400 |
commit | e1a7acafa59eec66b9458d2b3f665f48c41f051b (patch) | |
tree | 91d8dee9a8f0c2aa66abc755651efef6bcdb5ca8 /plugins | |
parent | 6c82534230eba6025b0c330b04493a2fdfe45f9e (diff) |
Thanks for the report. Could you apply this patch and confirm it is working for you?
Fixes #4156 Adding ORDER BY clause when DELETING so that it works with replication
https://dev.mysql.com/doc/refman/5.1/en/replication-features-limit.html
(cherry picked from commit ce6254e)
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/Goals/API.php | 2 | ||||
-rwxr-xr-x | plugins/PrivacyManager/LogDataPurger.php | 2 | ||||
-rwxr-xr-x | plugins/PrivacyManager/ReportsPurger.php | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php index 59866c8923..327e643405 100644 --- a/plugins/Goals/API.php +++ b/plugins/Goals/API.php @@ -207,7 +207,7 @@ class API WHERE idsite = ? AND idgoal = ?", array($idSite, $idGoal)); - Db::deleteAllRows(Common::prefixTable("log_conversion"), "WHERE idgoal = ?", 100000, array($idGoal)); + Db::deleteAllRows(Common::prefixTable("log_conversion"), "WHERE idgoal = ?", "idvisit", 100000, array($idGoal)); Cache::regenerateCacheWebsiteAttributes($idSite); } diff --git a/plugins/PrivacyManager/LogDataPurger.php b/plugins/PrivacyManager/LogDataPurger.php index 82b1a284dd..8fc1f3e3b0 100755 --- a/plugins/PrivacyManager/LogDataPurger.php +++ b/plugins/PrivacyManager/LogDataPurger.php @@ -76,7 +76,7 @@ class LogDataPurger foreach ($logTables as $logTable) { // deleting from log_action must be handled differently, so we do it later if ($logTable != Common::prefixTable('log_action')) { - Db::deleteAllRows($logTable, $where, $this->maxRowsToDeletePerQuery, array($maxIdVisit)); + Db::deleteAllRows($logTable, $where, "idvisit", $this->maxRowsToDeletePerQuery, array($maxIdVisit)); } } diff --git a/plugins/PrivacyManager/ReportsPurger.php b/plugins/PrivacyManager/ReportsPurger.php index c709cf34dd..df023999d4 100755 --- a/plugins/PrivacyManager/ReportsPurger.php +++ b/plugins/PrivacyManager/ReportsPurger.php @@ -118,7 +118,7 @@ class ReportsPurger if (!empty($where)) { $where = "WHERE $where"; } - Db::deleteAllRows($table, $where, $this->maxRowsToDeletePerQuery); + Db::deleteAllRows($table, $where, "idarchive", $this->maxRowsToDeletePerQuery); } if ($optimize) { @@ -133,7 +133,7 @@ class ReportsPurger if ($this->keepBasicMetrics == 1 && !empty($this->metricsToKeep)) { $where = "WHERE name NOT IN ('" . implode("','", $this->metricsToKeep) . "') AND name NOT LIKE 'done%'"; foreach ($oldNumericTables as $table) { - Db::deleteAllRows($table, $where, $this->maxRowsToDeletePerQuery); + Db::deleteAllRows($table, $where, "idarchive", $this->maxRowsToDeletePerQuery); } if ($optimize) { |