Merge branch 'master' of git://github.com/facebook/phabricator

2012-11-08 11:45:29 -08:00
parent c5508c214e 6cfc15ad6c
commit 378702e7b4
1 changed files with 4 additions and 2 deletions
--- a/resources/sql/patches/liskcounters.php
+++ b/resources/sql/patches/liskcounters.php
@@ -29,10 +29,12 @@ $initial_counter = max((int)$active_auto, (int)$active_max, (int)$archive_max);

 queryfx(
  $conn_w,
-  'INSERT IGNORE INTO %T (counterName, counterValue)
-    VALUES (%s, %d)',
+  'INSERT INTO %T (counterName, counterValue)
+    VALUES (%s, %d)
+    ON DUPLICATE KEY UPDATE counterValue = %d',
  LiskDAO::COUNTER_TABLE_NAME,
  $active_table->getTableName(),
+  $initial_counter + 1,
  $initial_counter + 1);

 // Drop AUTO_INCREMENT from the ID column.