A better comment on the generated code for the NULL-in-RHS-of-IN detection

logic.

FossilOrigin-Name: 9bc1c730a366e75b760b58e7a343d39165b2a469

diff --git a/manifest b/manifest
index 5a22fd3d13ba70b087f2b9dfe8e2a34ae61991c0..6b5c8679cedf9c110c5340c40217e741e7f9c17c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sdetection\sand\shandling\sof\sNULL\svalues\son\sthe\sRHS\sof\sa\sIN\soperator.
-D 2014-08-01T21:00:53.855
+C A\sbetter\scomment\son\sthe\sgenerated\scode\sfor\sthe\sNULL-in-RHS-of-IN\sdetection\nlogic.
+D 2014-08-01T21:12:35.509
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -176,7 +176,7 @@ F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
 F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
 F src/delete.c bcf8f72126cea80fc3d5bc5494cf19b3f8935aaf
-F src/expr.c ac35f4c83ccc090e4b31bf3c839d519762a86fd5
+F src/expr.c 564c28f4f68c30103ba4d8ef60b53f178f60eeb3
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c 8545f3b36da47473e10800ea4fb0810fd4062514
 F src/func.c 3bc223ea36cd29a91c481485343d0ee4257ab8dc
@@ -1185,7 +1185,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 c11e55fabbc718cb324ecd3540453c25db98f50c
-R d4c66ce9989f6295fb51f65762a6a30b
+P 468e730036edac22cfeb9ea3515aa16e6bcd6650
+R 894229228ea8340c8d39c1accaa43c91
 U drh
-Z 526f21f790d2042539b4ae116e22530d
+Z 2180e0f63fb08551c10fb11eafeeb559

diff --git a/manifest.uuid b/manifest.uuid
index 4742ee228e4322e92f172bb6a1c5b75c6ae232f0..764209da3fe172808841cf13ed46472e710fa57e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-468e730036edac22cfeb9ea3515aa16e6bcd6650
\ No newline at end of file
+9bc1c730a366e75b760b58e7a343d39165b2a469
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 6440dea397a7288f3ebb39c02a54f9b07ed40302..c32affe34cf97deac51d9dd18429c9c07289820c 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -1476,8 +1476,8 @@ int sqlite3CodeOnce(Parse *pParse){
 }
 
 /*
-** Generate code that checks the single-column index table iCur to see if
-** contains any NULL entries.  Cause the register at regHasNull to be set
+** Generate code that checks the left-most column of index table iCur to see if
+** it contains any NULL entries.  Cause the register at regHasNull to be set
 ** to a non-NULL value if iCur contains no NULLs.  Cause register regHasNull
 ** to be set to NULL if iCur contains one or more NULL values.
 */
@@ -1487,7 +1487,7 @@ static void sqlite3SetHasNullFlag(Vdbe *v, int iCur, int regHasNull){
   j1 = sqlite3VdbeAddOp1(v, OP_Rewind, iCur); VdbeCoverage(v);
   sqlite3VdbeAddOp3(v, OP_Column, iCur, 0, regHasNull);
   sqlite3VdbeChangeP5(v, OPFLAG_TYPEOFARG);
-  VdbeComment((v, "<maybe-NULL?>"));
+  VdbeComment((v, "first_entry_in(%d)", iCur));
   sqlite3VdbeJumpHere(v, j1);
 }