From: drh <drh@noemail.net>
Date: Tue, 8 Dec 2009 22:16:15 +0000 (+0000)
Subject: Change to order of two branches in vtab.c in order to a restore 100% test
X-Git-Tag: version-3.7.2~727
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e3c512bff88bb9d452eb80e5600b8b742d56cde;p=thirdparty%2Fsqlite.git

Change to order of two branches in vtab.c in order to a restore 100% test
coverage.

FossilOrigin-Name: fdfdc777c59a108496c7381c8b267b38485e2c13
---

diff --git a/manifest b/manifest
index 19699179bf..0141449f4c 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Add\scomments\sto\sbetter\sexplain\sthe\stwo-pass\smemory\sallocation\sapproach\nfor\sprepared\sstatements.
-D 2009-12-08T19:58:20
+C Change\sto\sorder\sof\stwo\sbranches\sin\svtab.c\sin\sorder\sto\sa\srestore\s100%\stest\ncoverage.
+D 2009-12-08T22:16:15
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -220,7 +220,7 @@ F src/vdbeaux.c 42ed644fea54c3fbfa70af7c65456ec4ab089c77
 F src/vdbeblob.c 84f924700a7a889152aeebef77ca5f4e3875ffb4
 F src/vdbemem.c 1e16e3a16e55f4c3452834f0e041726021aa66e0
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
-F src/vtab.c 4e73b2692080821aed36d62b20576e409f910883
+F src/vtab.c 7c7713d66cda699f16bf1cc601d8d4f5070ab935
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 11b5b00c49d53e767a7eb855bc60790edeca6185
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -780,14 +780,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P f0eac4175aee6c50ee68acc253f76fbe44574250
-R 74e90ca8b896b5a20c44aa66d10e0006
+P 0e5e18ea12c70559d4c63981c0bb5f9430c5bcbb
+R b37ac4b4a2f1150c99a08301f47a75ba
 U drh
-Z 0320ff4e0cbee5e0cb2eb5909024d39a
+Z 806e0dcdcc76e3167ff245e90aa4ddff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFLHq/foxKgR168RlERAgQcAJ9ODdpS9x2lE2gipwRBT8+tK/molACdEdYd
-2HL4PZWshwGphboQkJAqVMM=
-=4VUQ
+iD8DBQFLHtAyoxKgR168RlERAnD5AJ9lq59S/L2gVSJ3A1PkjLVKOpUOAgCfTs+c
+1MZRpUfX8XUtHldb5w5obss=
+=nCg9
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 3966807d69..658669a3a1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0e5e18ea12c70559d4c63981c0bb5f9430c5bcbb
\ No newline at end of file
+fdfdc777c59a108496c7381c8b267b38485e2c13
\ No newline at end of file
diff --git a/src/vtab.c b/src/vtab.c
index fbb6376980..d0bc22dcee 100644
--- a/src/vtab.c
+++ b/src/vtab.c
@@ -670,8 +670,8 @@ int sqlite3_declare_vtab(sqlite3 *db, const char *zCreateTable){
     pParse->db = db;
   
     if( SQLITE_OK==sqlite3RunParser(pParse, zCreateTable, &zErr) 
-     && !db->mallocFailed
      && pParse->pNewTable
+     && !db->mallocFailed
      && !pParse->pNewTable->pSelect
      && (pParse->pNewTable->tabFlags & TF_Virtual)==0
     ){