Fix a compiler warning in sqlite3VdbePreUpdateHook().

Add sqlite3session.c to the amalgamation.
Fix the Makefile.in to work with sessions.

FossilOrigin-Name: e54b0225f226a163ec874df7d4b738efba12b3a7

diff --git a/Makefile.in b/Makefile.in
index 652928b8cc26bb647ad1faf70119aee5ad1c9fbd..634c7a36544454da5864a6362b562fdfe57ce45c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,7 +26,8 @@ BCC = @BUILD_CC@ @BUILD_CFLAGS@
 # will run on the target platform.  (BCC and TCC are usually the
 # same unless your are cross-compiling.)
 #
-TCC = @CC@ @CPPFLAGS@ @CFLAGS@ -I. -I${TOP}/src -I${TOP}/ext/rtree
+TCC = @CC@ @CPPFLAGS@ @CFLAGS@ -I. -I${TOP}/src -I${TOP}/ext/rtree -I${TOP}/ext/icu
+TCC += -I${TOP}/ext/fts3 -I${TOP}/ext/async -I${TOP}/ext/session
 
 # Define this for the autoconf-based build, so that the code knows it can
 # include the generated config.h
@@ -76,6 +77,7 @@ TEMP_STORE = -DSQLITE_TEMP_STORE=@TEMP_STORE@
 # The same set of OMIT and ENABLE flags should be passed to the 
 # LEMON parser generator and the mkkeywordhash tool as well.
 OPT_FEATURE_FLAGS = @OPT_FEATURE_FLAGS@
+OPT_FEATURE_FLAGS += -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_PREUPDATE_HOOK
 
 TCC += $(OPT_FEATURE_FLAGS)
 
@@ -175,7 +177,8 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
          mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
          notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
          pager.lo parse.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
-         random.lo resolve.lo rowset.lo rtree.lo select.lo status.lo \
+         random.lo resolve.lo rowset.lo rtree.lo \
+         sqlite3session.lo select.lo status.lo \
          table.lo tokenize.lo trigger.lo \
          update.lo util.lo vacuum.lo \
          vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
@@ -325,6 +328,10 @@ SRC += \
 SRC += \
   $(TOP)/ext/rtree/rtree.h \
   $(TOP)/ext/rtree/rtree.c
+SRC += \
+  $(TOP)/ext/session/sqlite3session.c \
+  $(TOP)/ext/session/sqlite3session.h
+
 
 
 # Generated source code files
@@ -384,7 +391,8 @@ TESTSRC = \
   $(TOP)/src/test_wholenumber.c \
   $(TOP)/src/test_wsd.c       \
   $(TOP)/ext/fts3/fts3_term.c \
-  $(TOP)/ext/fts3/fts3_test.c 
+  $(TOP)/ext/fts3/fts3_test.c  \
+  $(TOP)/ext/session/test_session.c
 
 # Source code to the library files needed by the test fixture
 #
@@ -428,7 +436,8 @@ TESTSRC2 = \
   $(TOP)/ext/fts3/fts3_term.c \
   $(TOP)/ext/fts3/fts3_tokenizer.c \
   $(TOP)/ext/fts3/fts3_write.c \
-  $(TOP)/ext/async/sqlite3async.c
+  $(TOP)/ext/async/sqlite3async.c \
+  $(TOP)/ext/session/sqlite3session.c 
 
 # Header files used by all library source files.
 #
@@ -864,6 +873,9 @@ fts3_write.lo:      $(TOP)/ext/fts3/fts3_write.c $(HDR) $(EXTHDR)
 rtree.lo:      $(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
        $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/rtree/rtree.c
 
+sqlite3session.lo:     $(TOP)/ext/session/sqlite3session.c $(HDR) $(EXTHDR)
+       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/session/sqlite3session.c
+
 
 # Rules to build the 'testfixture' application.
 #

diff --git a/Makefile.msc b/Makefile.msc
index cc726ae9595c993ba3c6d14de9f93b0b0bafbecf..a15c755d2e672aa6fee5d5f18b79db702a14be4e 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -232,6 +232,7 @@ TCC = $(TCC) -I$(TOP)\ext\fts3
 RCC = $(RCC) -I$(TOP)\ext\fts3
 TCC = $(TCC) -I$(TOP)\ext\rtree
 RCC = $(RCC) -I$(TOP)\ext\rtree
+TCC = $(TCC) -I$(TOP)\ext\session
 !ENDIF
 
 # Define -DNDEBUG to compile without debugging (i.e., for production usage)
@@ -488,7 +489,8 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
          mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
          notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
          pager.lo parse.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
-         random.lo resolve.lo rowset.lo rtree.lo select.lo status.lo \
+         random.lo resolve.lo rowset.lo rtree.lo \
+         sqlite3session.lo select.lo status.lo \
          table.lo tokenize.lo trigger.lo \
          update.lo util.lo vacuum.lo \
          vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
@@ -1198,6 +1200,9 @@ fts3_write.lo:    $(TOP)\ext\fts3\fts3_write.c $(HDR) $(EXTHDR)
 rtree.lo:      $(TOP)\ext\rtree\rtree.c $(HDR) $(EXTHDR)
        $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\rtree\rtree.c
 
+rtree.lo:      $(TOP)\ext\session\sqlite3sesion.c $(HDR) $(EXTHDR)
+       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\session\sqlite3session.c
+
 
 # Rules to build the 'testfixture' application.
 #

diff --git a/manifest b/manifest
index 53fce838c5f77e871882222bf4cd14cb60e87eb3..10fc1652325fce073a5a21d2bbe7cab6f4dc5d7a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
-D 2013-03-13T06:34:51.061
+C Fix\sa\scompiler\swarning\sin\ssqlite3VdbePreUpdateHook().\nAdd\ssqlite3session.c\sto\sthe\samalgamation.\nFix\sthe\sMakefile.in\sto\swork\swith\ssessions.
+D 2013-03-13T11:42:00.694
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5
+F Makefile.in f33fad60e6fa3cc15f6a39609a256b340a1c12d9
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 5de508f802789aae3e96d86261c5cf633d67ce00
+F Makefile.msc 29bce8fa86dc10ffeb5ac11537c0e12c3a3e6887
 F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION 6d4f66eaebabc42ef8c2a4d2d0caf4ce7ee81137
@@ -255,7 +255,7 @@ F src/vdbe.c 9e4164ac85aa01e1a563e6c7f565b106ff0bf67b
 F src/vdbe.h 1223e2548e0970cf96f573ff6b99f804a36ad683
 F src/vdbeInt.h 0112cab1c820a599005c6bcc9504bdb17f5dbcdb
 F src/vdbeapi.c b816227ece97354aee7a741c1fc3c5445202d8bb
-F src/vdbeaux.c 684c159170453c8a118786b9c174627ece825f3a
+F src/vdbeaux.c b49b277bcac5ac1e14165f13b7cd320b5333f420
 F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
 F src/vdbemem.c 833005f1cbbf447289f1973dba2a0c2228c7b8ab
 F src/vdbesort.c c61ca318681c0e7267da8be3abfca8469652a7e9
@@ -1022,7 +1022,7 @@ F tool/mkkeywordhash.c bb52064aa614e1426445e4b2b9b00eeecd23cc79
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
-F tool/mksqlite3c.tcl 589c7f44e990be1b8443cfe4808dce392b0327fa
+F tool/mksqlite3c.tcl bb8afe0948d88d5d9e6f80d75f2b89face94af08
 F tool/mksqlite3h.tcl 78013ad79a5e492e5f764f3c7a8ef834255061f8
 F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
 F tool/mkvsix.tcl 0be7f7a591f1e83f9199cb82911b66668ca484c9
@@ -1051,7 +1051,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 62adb0e0d70e619becb68ffd2625d979bcc777cd 839aa91faf1db7025d90fa3c65e50efb829b053b
-R f971c8bcbe5e7e01d3f1960cb48792c9
-U dan
-Z 72580c54b4ef9e18ca4a1b86983b9c48
+P d6cd3c780c6bc718d37e0f0b884e3e9a423d57be
+R 8d8bef3ec05b88293bab641b3f53c396
+U drh
+Z 2a31f3327a39b82b184325a96aea6d38

diff --git a/manifest.uuid b/manifest.uuid
index 5a3c033a66271df317ea4269da564d3f7ade8dce..cad3cf810734506f6e27ac5a2c3e65027391fbd3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d6cd3c780c6bc718d37e0f0b884e3e9a423d57be
\ No newline at end of file
+e54b0225f226a163ec874df7d4b738efba12b3a7
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 7a676a2e39043e8aa33dbd45f405e527fb2dd2a2..b54d6b918f62896afa486e412c34001c3ec97c22 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -3313,7 +3313,7 @@ void sqlite3VdbePreUpdateHook(
   preupdate.keyinfo.db = db;
   preupdate.keyinfo.enc = ENC(db);
   preupdate.keyinfo.nField = pTab->nCol;
-  preupdate.keyinfo.aSortOrder = &fakeSortOrder;
+  preupdate.keyinfo.aSortOrder = (u8*)&fakeSortOrder;
   preupdate.iKey1 = iKey1;
   preupdate.iKey2 = iKey2;
   preupdate.iPKey = pTab->iPKey;

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index 2c569d7a4eb494e28977dcc95ea975b13e43af2a..d08d9d2f1b7cac97e2add7511fbf0a70d4baca68 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -108,6 +108,7 @@ foreach hdr {
    parse.h
    pcache.h
    rtree.h
+   sqlite3session.h
    sqlite3ext.h
    sqlite3.h
    sqliteicu.h
@@ -319,6 +320,8 @@ foreach file {
    rtree.c
    icu.c
    fts3_icu.c
+
+   sqlite3session.c
 } {
   copy_file tsrc/$file
 }