From: drh <drh@noemail.net>
Date: Tue, 25 Oct 2011 21:18:17 +0000 (+0000)
Subject: Cherrypick the [3513bf6ee090d9] so that the sqlite_source_id() function works correct... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=569d74dc5feaa5b188b81eb4b6bbbf56e9dbcf8e;p=thirdparty%2Fsqlite.git

Cherrypick the [3513bf6ee090d9] so that the sqlite_source_id() function works correctly even with newer versions of Fossil

FossilOrigin-Name: 89d63a0e1db6a86fa173fb8a4e3a3904ef9e488c
---

diff --git a/manifest b/manifest
index b6f89e66a8..187eec8f31 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Cherrypick\schanges\s[53f5cfe115]\sand\s[1f7ef0af8d]\sin\sorder\sto\sfix\san\sissue\swith\sDISTINCT
-D 2011-10-25T20:36:39.155
+C Cherrypick\sthe\s[3513bf6ee090d9]\sso\sthat\sthe\ssqlite_source_id()\sfunction\sworks\scorrectly\seven\swith\snewer\sversions\sof\sFossil
+D 2011-10-25T21:18:17.179
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 543f91f24cd7fee774ecc0a61c19704c0c3e78fd
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -830,7 +830,7 @@ F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c.tcl aff0d53f0e84cf919922c0d02e767bdf5eeafb90
-F tool/mksqlite3h.tcl eb100dce83f24b501b325b340f8b5eb8e5106b3b
+F tool/mksqlite3h.tcl 71437ab26219c0414e05231eb9b7d8f50c2cb279
 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
 F tool/omittest.tcl ec597b7db5177df7108705961171200d7ffcd786
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -852,7 +852,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 41b5f86971ed9d7ddca31bd9b43d0a41f03f002b
-R 21abcfcc965121f7efbad8f281615142
+P 14bc58ca70336aed62069f223324304835991c55
+R af5db398d4569192dd77a70de5aadb2c
 U drh
-Z 1aced37d95114768e299b980f9a55bae
+Z e43e421cba9e7717a13b85e140461f3f
diff --git a/manifest.uuid b/manifest.uuid
index 2d26de10ca..8bc4863887 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-14bc58ca70336aed62069f223324304835991c55
\ No newline at end of file
+89d63a0e1db6a86fa173fb8a4e3a3904ef9e488c
\ No newline at end of file
diff --git a/tool/mksqlite3h.tcl b/tool/mksqlite3h.tcl
index 58fe8a8905..8e9ce22a6e 100644
--- a/tool/mksqlite3h.tcl
+++ b/tool/mksqlite3h.tcl
@@ -53,7 +53,7 @@ set in [open $TOP/manifest]
 set zDate {}
 while {![eof $in]} {
   set line [gets $in]
-  if {[regexp {^D (2.*[0-9])} $line all date]} {
+  if {[regexp {^D (2[-0-9T:]+)} $line all date]} {
     set zDate [string map {T { }} $date]
     break
   }