From: drh <drh@noemail.net>
Date: Tue, 7 Feb 2017 21:44:40 +0000 (+0000)
Subject: When generating the hash on the sqlite_master table in dbselftest, use an
X-Git-Tag: version-3.17.0~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec26ce33281a2ae08852d729f41fd0c1cce09a5e;p=thirdparty%2Fsqlite.git

When generating the hash on the sqlite_master table in dbselftest, use an
ORDER BY clause, since the sqlite_master table is reordered by VACUUM.

FossilOrigin-Name: c8bfd99b96608a08f934f46b4e1a4d0f1cc69ea7
---

diff --git a/manifest b/manifest
index a3e5404e7d..e98ee3d2a4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C MSVC\smakefile\senhancments\sfor\sseveral\scommand\sline\stools\sand\sthe\ssession\sextensions.
-D 2017-02-07T21:09:34.792
+C When\sgenerating\sthe\shash\son\sthe\ssqlite_master\stable\sin\sdbselftest,\suse\san\nORDER\sBY\sclause,\ssince\sthe\ssqlite_master\stable\sis\sreordered\sby\sVACUUM.
+D 2017-02-07T21:44:40.303
 F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 067a6766f800cc8d72845ab61f8de4ffe8f3fc99
@@ -636,7 +636,7 @@ F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856
 F test/cursorhint2.test 8457e93d97f665f23f97cdbc8477d16e3480331b
 F test/date.test a6a5a48b90907bca9fbcc79a30be5a715c1ab2fc
 F test/dbfuzz.c 73047c920d6210e5912c87cdffd9a1c281d4252e
-F test/dbselftest.c 4bf86fe04dc2d0d58dabc5e6b7a06fa4ef7827ea
+F test/dbselftest.c b2e6cfac59066dbcb7334b66304bb15a5508dd42
 F test/dbstatus.test 73149851b3aff14fc6db478e58f9083a66422cf5
 F test/dbstatus2.test e93ab03bfae6d62d4d935f20de928c19ca0ed0ab
 F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
@@ -1555,7 +1555,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 61242267824135a9d5438ec15e3352a2f21dc2fc
-R 2db6df3e55ca3fe258c2e43d80c841d4
-U mistachkin
-Z ad604e11dbe50606213e8f571c7cab8e
+P fc1dfe870279531d77ffb18a9ca4b4dcbc7aab8d
+R f274165d340f013add78e0f37722933a
+U drh
+Z fc92264580c9fd0c7c0e56ba0825054f
diff --git a/manifest.uuid b/manifest.uuid
index 4a692b1501..b6d3f806f6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fc1dfe870279531d77ffb18a9ca4b4dcbc7aab8d
\ No newline at end of file
+c8bfd99b96608a08f934f46b4e1a4d0f1cc69ea7
\ No newline at end of file
diff --git a/test/dbselftest.c b/test/dbselftest.c
index d8a9c331de..3a238bce16 100644
--- a/test/dbselftest.c
+++ b/test/dbselftest.c
@@ -568,7 +568,7 @@ static int buildSelftestTable(sqlite3 *db){
   );
   if( rc ) return 1;
   tno = 110;
-  zSql = "SELECT type,name,tbl_name,sql FROM sqlite_master";
+  zSql = "SELECT type,name,tbl_name,sql FROM sqlite_master ORDER BY name";
   sha1Exec(db, zSql, zHash);
   rc = runSql(db, 
       "INSERT INTO selftest(tno,op,sql,ans)"