diff options
| author | drh <drh@noemail.net> | 2016-09-05 19:57:46 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-09-05 19:57:46 +0000 |
| commit | c1bcd9cc3e9913acec4d8b04178d52826f82eb2d (patch) | |
| tree | 5e9346b621555be65fb95eabbff30614cc46cd5a | |
| parent | 3fffbf932719916b9a6564280b1254ce4f6c5012 (diff) | |
| download | sqlite-c1bcd9cc3e9913acec4d8b04178d52826f82eb2d.tar.gz sqlite-c1bcd9cc3e9913acec4d8b04178d52826f82eb2d.zip | |
Fix an assert() so that it does C-compiler does not combine an assert()
conditional with a production code conditional and thereby confuse the mutation
testing script.
FossilOrigin-Name: 2fa5288a7ef43f1fb26037c1b5e84b7b90400623
| -rw-r--r-- | manifest | 12 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/expr.c | 2 |
3 files changed, 8 insertions, 8 deletions
@@ -1,5 +1,5 @@ -C Simplifications\sto\sthe\sSQLITE_KEEPNULL\sflag\son\sVDBE\scomparison\soperators. -D 2016-09-05T15:02:41.820 +C Fix\san\sassert()\sso\sthat\sit\sdoes\sC-compiler\sdoes\snot\scombine\san\sassert()\nconditional\swith\sa\sproduction\scode\sconditional\sand\sthereby\sconfuse\sthe\smutation\ntesting\sscript. +D 2016-09-05T19:57:46.769 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c @@ -338,7 +338,7 @@ F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7 F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d F src/delete.c 76c084f0265f4a3cd1ecf17eee112a94f1ccbc05 -F src/expr.c 942c417e84e835ce51c6b732afa0b4572110e1c1 +F src/expr.c 48b18962e32c22be92eb00ef941499f4c80efd2c F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fkey.c e2be0968c1adc679c87e467aa5b4f167588f38a8 F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771 @@ -1522,7 +1522,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P ae127bcc0a5827786853f47b229021435d6098d7 -R b6639bee17b9273a45c7e5e2da3019f4 +P 96269f0179a7d8fa44ee278cef362962368c59ef +R 2715120448e06410de8fb9d7dcf49e0c U drh -Z a8418630f7d7128d87f9b291fb48ec92 +Z 8e9c25e5732d609d10738e0bb4ef6b76 diff --git a/manifest.uuid b/manifest.uuid index 1973c3697..9849952ab 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -96269f0179a7d8fa44ee278cef362962368c59ef
\ No newline at end of file +2fa5288a7ef43f1fb26037c1b5e84b7b90400623
\ No newline at end of file diff --git a/src/expr.c b/src/expr.c index f604ae4fe..517034ca3 100644 --- a/src/expr.c +++ b/src/expr.c @@ -487,7 +487,7 @@ static int exprVectorRegister( int *pRegFree /* OUT: Temp register to free */ ){ u8 op = pVector->op; - assert( op==TK_VECTOR || op==TK_SELECT || op==TK_REGISTER ); + assert( op==TK_VECTOR || op==TK_REGISTER || op==TK_SELECT ); if( op==TK_REGISTER ){ *ppExpr = sqlite3VectorFieldSubexpr(pVector, iField); return pVector->iTable+iField; |