diff options
| author | dan <dan@noemail.net> | 2015-09-19 18:11:18 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2015-09-19 18:11:18 +0000 |
| commit | 80b7198f2bc3933d4f870a60832e009e9830723f (patch) | |
| tree | d313b52d0d587309bf6b36fd04007a35c88efb1c | |
| parent | 8faee877cbb783d2f7edb38b5f4eae1a5cee9a4d (diff) | |
| download | sqlite-80b7198f2bc3933d4f870a60832e009e9830723f.tar.gz sqlite-80b7198f2bc3933d4f870a60832e009e9830723f.zip | |
Add an assert() statement to delete.c.
FossilOrigin-Name: 40fce67ecf0e71db3c8f3da3f72cc80a3d0f8fb2
| -rw-r--r-- | manifest | 14 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/delete.c | 1 |
3 files changed, 9 insertions, 8 deletions
@@ -1,5 +1,5 @@ -C Fix\scompiler\swarnings. -D 2015-09-19T18:08:13.197 +C Add\san\sassert()\sstatement\sto\sdelete.c. +D 2015-09-19T18:11:18.686 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2047811644c5bac91ccdfc2720e49b60965a63a7 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -291,7 +291,7 @@ F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b F src/date.c fb1c99172017dcc8e237339132c91a21a0788584 F src/dbstat.c e637e7a7ff40ef32132a418c6fdf1cfb63aa27c7 -F src/delete.c 5ab483f15aaf202290227d5dd1f10a7ecce3d6b1 +F src/delete.c 371df4fc86e96efeaed3d37565aef77f956be109 F src/expr.c 3a76afcdac925294c39903b7002ddb9e5fd29863 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fkey.c 83e1baba999bed3144ea5a2143fc922edf51135f @@ -1387,7 +1387,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 809d67b61164b83bbb6962f0edee1793a483ccab -R bab8c56b96d20ed3c77321003b4b9a52 -U drh -Z 6a9fa43b557b8b4a775a8ba25a8484d8 +P 5c31ee62a196b914673384a611534fd778dc64b0 +R 4ce047a31774a6a4781364ff4ecf8f55 +U dan +Z 15395d5bafcc929901d2af1e98ec30be diff --git a/manifest.uuid b/manifest.uuid index 426b3831b..a9d23a922 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5c31ee62a196b914673384a611534fd778dc64b0
\ No newline at end of file +40fce67ecf0e71db3c8f3da3f72cc80a3d0f8fb2
\ No newline at end of file diff --git a/src/delete.c b/src/delete.c index 860b2cf11..c387c20be 100644 --- a/src/delete.c +++ b/src/delete.c @@ -412,6 +412,7 @@ void sqlite3DeleteFrom( if( pWInfo==0 ) goto delete_from_cleanup; eOnePass = sqlite3WhereOkOnePass(pWInfo, aiCurOnePass); assert( IsVirtual(pTab)==0 || eOnePass==ONEPASS_OFF ); + assert( IsVirtual(pTab) || bComplex || eOnePass!=ONEPASS_OFF ); /* Keep track of the number of rows to be deleted */ if( db->flags & SQLITE_CountRows ){ |