From: drh <drh@noemail.net>
Date: Mon, 1 Sep 2014 22:34:54 +0000 (+0000)
Subject: Avoid a confusing (though correct) argument to the sqlite3_result_blob()
X-Git-Tag: version-3.8.7~129
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=975e076681a671ccd828e8b02db84bfc388c9e98;p=thirdparty%2Fsqlite.git

Avoid a confusing (though correct) argument to the sqlite3_result_blob()
function in the implementation of ANALYZE.

FossilOrigin-Name: 4cae93f8ae8fb3fe38fd5dc7d3a5ea0d11552841
---

diff --git a/manifest b/manifest
index 9b13d487a6..59d93adfce 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C For\ssqlite3_win32_is_nt(),\sassume\sWinRT\sis\sNT-based\sand\srevise\s#ifdef\sordering\sto\sprefer\sthe\sANSI\sversion\sof\sGetVersionEx,\swhen\savailable.
-D 2014-09-01T19:29:19.886
+C Avoid\sa\sconfusing\s(though\scorrect)\sargument\sto\sthe\ssqlite3_result_blob()\nfunction\sin\sthe\simplementation\sof\sANALYZE.
+D 2014-09-01T22:34:54.079
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -162,7 +162,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 3d8b83c91651f53472ca17599dae3457b8b89494
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F src/alter.c b00900877f766f116f9e16116f1ccacdc21d82f1
-F src/analyze.c f98a351908da29f7b44741cfeb9eb20dda648ba0
+F src/analyze.c 75345fa58d5d044614bedff9d758e3483a4f4522
 F src/attach.c 3801129015ef59d76bf23c95ef9b0069d18a0c52
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e
@@ -1193,7 +1193,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 672e7387b1bda8d007da7de4244226577d7ab2dc 9fe0f0754c063c17fffa9d4814b7180397cf5226
-R d670693d3a9e7f5751de171ad69fa48b
-U mistachkin
-Z f220ace468e0f2c0622bd628ba90e47a
+P be0a037244762cc0f5ff4a6d7822902f862767bd
+R 5498da01c32f540309f235f11a91d5bf
+U drh
+Z 21cb2c2a001f5844bb20a699e6bc27e5
diff --git a/manifest.uuid b/manifest.uuid
index 4ae70b9684..1f41bd67e6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-be0a037244762cc0f5ff4a6d7822902f862767bd
\ No newline at end of file
+4cae93f8ae8fb3fe38fd5dc7d3a5ea0d11552841
\ No newline at end of file
diff --git a/src/analyze.c b/src/analyze.c
index f9c03dc848..693e2f5472 100644
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -467,7 +467,7 @@ static void statInit(
 #endif
 
   /* Return a pointer to the allocated object to the caller */
-  sqlite3_result_blob(context, p, sizeof(p), stat4Destructor);
+  sqlite3_result_blob(context, p, sizeof(*p), stat4Destructor);
 }
 static const FuncDef statInitFuncdef = {
   2+IsStat34,      /* nArg */