SHA1 Hash:	5602bbbaff8432d83e18d6b7b3d7914d61e0c1e0
Date:	2007-07-30 17:05:25
User:	drh
Comment:	Fix a bug in the logic for finding a pivot during a merge.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified src/pivot.c from [9d690dcb00] to [b19f3743af].

@@ -69,11 +69,11 @@
 ** desired.
 */
 void pivot_set_secondary(int rid){
   /* Insert the primary record */
   db_multi_exec(
-    "INSERT INTO aqueue(rid, mtime, pending, src)"
+    "INSERT OR IGNORE INTO aqueue(rid, mtime, pending, src)"
     "  SELECT %d, mtime, 1, 0 FROM plink WHERE cid=%d",
     rid, rid
   );
 }