Do not use sorters for INSERT statements that insert multiple rows using the VALUES...

FossilOrigin-Name: 93e28ea1ef41f274c5685f3bbb93a4d9ad44c880

diff --git a/manifest b/manifest
index d872daac6a519eeb523cab7bc65b0d5b48cc2a65..113d3bff98d313e1c369ec0cb5eb942559d0ca40 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
-D 2015-03-21T15:04:27.266
+C Do\snot\suse\ssorters\sfor\sINSERT\sstatements\sthat\sinsert\smultiple\srows\susing\sthe\sVALUES\sclause.
+D 2015-03-21T15:26:42.797
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -190,7 +190,7 @@ F src/global.c 4f77cadbc5427d00139ba43d0f3979804cbb700e
 F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
 F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
-F src/insert.c 004d1f12366be4b07cec2c61fd632cca917b1c0d
+F src/insert.c 9073db4b72ac7e8caf25cab3f49397a0469abdcc
 F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
@@ -1247,7 +1247,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 35eef4ddd5010b869ed6daa5017caebc79d0b3fa 2fbfec62fc03d42ee240dfefaa0aeb59a3f04d88
-R 6b7e0c7643d731f810248dc56d58f871
+P 9affe7f3f9ccb4fd93d428d6c1c2370b09ad0383
+R 9ef0aead9ff0deadb11db08c0257fc6f
 U dan
-Z 81495d62ecfb654e978235107e1dfeb1
+Z a6ed9796bd7e5025b34dc9f9110907bc

diff --git a/manifest.uuid b/manifest.uuid
index 3a9d98c13a783b418f62728fe021a68a7f53f37e..a9723e08182bbafb087e7d6c57d4b06c0e8c56e6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9affe7f3f9ccb4fd93d428d6c1c2370b09ad0383
\ No newline at end of file
+93e28ea1ef41f274c5685f3bbb93a4d9ad44c880
\ No newline at end of file

diff --git a/src/insert.c b/src/insert.c
index 5bbe40fcf1ed240dc593d5101d4c3323e4bd5159..6a3358e260b88fbfd1e747a76d6bec52d3f453a2 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -786,6 +786,7 @@ void sqlite3Insert(
     **      including INTEGER PRIMARY KEYs, is either ROLLBACK or ABORT.
     */
     if( pSelect 
+     && 0==(pSelect->selFlags & SF_Values)
      && onError!=OE_Fail && onError!=OE_Replace && onError!=OE_Ignore
      && !IsVirtual(pTab) 
      && pTrigger==0