Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch session-make Excluding Merge-Ins
This is equivalent to a diff from 0715ce1643 to e462cde2a5
|
2016-05-03
| ||
| 14:57 | The session extension is disabled by default. To enable it using --enable-session on ./configure on unix and add SESSION=1 to the nmake on Windows. Or add -DSQLITE_ENABLE_SESSION and -DSQLITE_ENABLE_PREUPDATE_HOOK to build manually. (check-in: bcaa650e87 user: drh tags: trunk) | |
| 13:14 | Turn the session extension off by default. Enable using --enable-session on configure scripts, or using the SESSION=1 argument to nmake on Windows. (Closed-Leaf check-in: e462cde2a5 user: drh tags: session-make) | |
| 00:04 | Avoid left-shifts of signed integers. (check-in: 0715ce1643 user: drh tags: trunk) | |
|
2016-05-02
| ||
| 19:05 | Remove some randomness from test script temptable2.test. (check-in: 5830cf72e9 user: dan tags: trunk) | |
Changes to Makefile.in.
78 78 TEMP_STORE = -DSQLITE_TEMP_STORE=@TEMP_STORE@ 79 79 80 80 # Enable/disable loadable extensions, and other optional features 81 81 # based on configuration. (-DSQLITE_OMIT*, -DSQLITE_ENABLE*). 82 82 # The same set of OMIT and ENABLE flags should be passed to the 83 83 # LEMON parser generator and the mkkeywordhash tool as well. 84 84 OPT_FEATURE_FLAGS = @OPT_FEATURE_FLAGS@ 85 -OPT_FEATURE_FLAGS += -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_PREUPDATE_HOOK 86 85 87 86 TCC += $(OPT_FEATURE_FLAGS) 88 87 89 88 # Add in any optional parameters specified on the make commane line 90 89 # ie. make "OPTS=-DSQLITE_ENABLE_FOO=1 -DSQLITE_OMIT_FOO=1". 91 90 TCC += $(OPTS) 92 91
Changes to Makefile.msc.
260 260 # These are the "standard" SQLite compilation options used when compiling for 261 261 # the Windows platform. 262 262 # 263 263 !IFNDEF OPT_FEATURE_FLAGS 264 264 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1 265 265 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1 266 266 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1 267 +!ENDIF 268 + 269 +# Enable support for the session extension if the SESSION=1 argument is 270 +# present on the nmake command-line 271 +# 272 +!IFNDEF SESSION 273 +SESSION = 0 274 +!ENDIF 275 +!IF $(SESSION)!=0 267 276 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION=1 268 277 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK=1 269 278 !ENDIF 270 279 271 280 # These are the "extended" SQLite compilation options used when compiling for 272 281 # the Windows 10 platform. 273 282 #
Changes to autoconf/Makefile.am.
1 1 2 -AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE 2 +AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE 3 3 4 4 lib_LTLIBRARIES = libsqlite3.la 5 5 libsqlite3_la_SOURCES = sqlite3.c 6 6 libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 7 7 8 8 bin_PROGRAMS = sqlite3 9 9 sqlite3_SOURCES = shell.c sqlite3.h
Changes to autoconf/Makefile.msc.
245 245 # These are the "standard" SQLite compilation options used when compiling for 246 246 # the Windows platform. 247 247 # 248 248 !IFNDEF OPT_FEATURE_FLAGS 249 249 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1 250 250 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1 251 251 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1 252 +!ENDIF 253 + 254 +# Enable support for the session extension if the SESSION=1 argument is 255 +# present on the nmake command-line 256 +# 257 +!IFNDEF SESSION 258 +SESSION = 0 259 +!ENDIF 260 +!IF $(SESSION)!=0 252 261 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION=1 253 262 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK=1 254 263 !ENDIF 255 264 256 265 # These are the "extended" SQLite compilation options used when compiling for 257 266 # the Windows 10 platform. 258 267 #
Changes to autoconf/configure.ac.
117 117 [--enable-json1], [include json1 support [default=no]])], 118 118 [], [enable_json1=no]) 119 119 if test x"$enable_json1" == "xyes"; then 120 120 JSON1_FLAGS=-DSQLITE_ENABLE_JSON1 121 121 fi 122 122 AC_SUBST(JSON1_FLAGS) 123 123 #----------------------------------------------------------------------- 124 + 125 +#----------------------------------------------------------------------- 126 +# --enable-session 127 +# 128 +AC_ARG_ENABLE(session, [AS_HELP_STRING( 129 + [--enable-session], [enable the session extension [default=no]])], 130 + [], [enable_session=no]) 131 +if test x"$enable_session" == "xyes"; then 132 + SESSION_FLAGS="-DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_PREUPDATE_HOOK" 133 +fi 134 +AC_SUBST(SESSION_FLAGS) 135 +#----------------------------------------------------------------------- 124 136 125 137 #----------------------------------------------------------------------- 126 138 # --enable-static-shell 127 139 # 128 140 AC_ARG_ENABLE(static-shell, [AS_HELP_STRING( 129 141 [--enable-static-shell], 130 142 [statically link libsqlite3 into shell tool [default=yes]])],
Changes to configure.
904 904 enable_amalgamation 905 905 enable_load_extension 906 906 enable_fts3 907 907 enable_fts4 908 908 enable_fts5 909 909 enable_json1 910 910 enable_rtree 911 +enable_session 911 912 enable_gcov 912 913 ' 913 914 ac_precious_vars='build_alias 914 915 host_alias 915 916 target_alias 916 917 CC 917 918 CFLAGS ................................................................................ 1552 1553 --disable-load-extension 1553 1554 Disable loading of external extensions 1554 1555 --enable-fts3 Enable the FTS3 extension 1555 1556 --enable-fts4 Enable the FTS4 extension 1556 1557 --enable-fts5 Enable the FTS5 extension 1557 1558 --enable-json1 Enable the JSON1 extension 1558 1559 --enable-rtree Enable the RTREE extension 1560 + --enable-session Enable the SESSION extension 1559 1561 --enable-gcov Enable coverage testing using gcov 1560 1562 1561 1563 Optional Packages: 1562 1564 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] 1563 1565 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) 1564 1566 --with-pic try to use only PIC/non-PIC objects [default=use 1565 1567 both] ................................................................................ 3919 3921 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 3920 3922 $as_echo_n "checking the name lister ($NM) interface... " >&6; } 3921 3923 if ${lt_cv_nm_interface+:} false; then : 3922 3924 $as_echo_n "(cached) " >&6 3923 3925 else 3924 3926 lt_cv_nm_interface="BSD nm" 3925 3927 echo "int some_variable = 0;" > conftest.$ac_ext 3926 - (eval echo "\"\$as_me:3926: $ac_compile\"" >&5) 3928 + (eval echo "\"\$as_me:3928: $ac_compile\"" >&5) 3927 3929 (eval "$ac_compile" 2>conftest.err) 3928 3930 cat conftest.err >&5 3929 - (eval echo "\"\$as_me:3929: $NM \\\"conftest.$ac_objext\\\"\"" >&5) 3931 + (eval echo "\"\$as_me:3931: $NM \\\"conftest.$ac_objext\\\"\"" >&5) 3930 3932 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) 3931 3933 cat conftest.err >&5 3932 - (eval echo "\"\$as_me:3932: output\"" >&5) 3934 + (eval echo "\"\$as_me:3934: output\"" >&5) 3933 3935 cat conftest.out >&5 3934 3936 if $GREP 'External.*some_variable' conftest.out > /dev/null; then 3935 3937 lt_cv_nm_interface="MS dumpbin" 3936 3938 fi 3937 3939 rm -f conftest* 3938 3940 fi 3939 3941 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 ................................................................................ 5131 5133 ;; 5132 5134 esac 5133 5135 fi 5134 5136 rm -rf conftest* 5135 5137 ;; 5136 5138 *-*-irix6*) 5137 5139 # Find out which ABI we are using. 5138 - echo '#line 5138 "configure"' > conftest.$ac_ext 5140 + echo '#line 5140 "configure"' > conftest.$ac_ext 5139 5141 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 5140 5142 (eval $ac_compile) 2>&5 5141 5143 ac_status=$? 5142 5144 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 5143 5145 test $ac_status = 0; }; then 5144 5146 if test "$lt_cv_prog_gnu_ld" = yes; then 5145 5147 case `/usr/bin/file conftest.$ac_objext` in ................................................................................ 6656 6658 # Note that $ac_compile itself does not contain backslashes and begins 6657 6659 # with a dollar sign (not a hyphen), so the echo should work correctly. 6658 6660 # The option is referenced via a variable to avoid confusing sed. 6659 6661 lt_compile=`echo "$ac_compile" | $SED \ 6660 6662 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 6661 6663 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 6662 6664 -e 's:$: $lt_compiler_flag:'` 6663 - (eval echo "\"\$as_me:6663: $lt_compile\"" >&5) 6665 + (eval echo "\"\$as_me:6665: $lt_compile\"" >&5) 6664 6666 (eval "$lt_compile" 2>conftest.err) 6665 6667 ac_status=$? 6666 6668 cat conftest.err >&5 6667 - echo "$as_me:6667: \$? = $ac_status" >&5 6669 + echo "$as_me:6669: \$? = $ac_status" >&5 6668 6670 if (exit $ac_status) && test -s "$ac_outfile"; then 6669 6671 # The compiler can only warn and ignore the option if not recognized 6670 6672 # So say no if there are warnings other than the usual output. 6671 6673 $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp 6672 6674 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 6673 6675 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then 6674 6676 lt_cv_prog_compiler_rtti_exceptions=yes ................................................................................ 6995 6997 # Note that $ac_compile itself does not contain backslashes and begins 6996 6998 # with a dollar sign (not a hyphen), so the echo should work correctly. 6997 6999 # The option is referenced via a variable to avoid confusing sed. 6998 7000 lt_compile=`echo "$ac_compile" | $SED \ 6999 7001 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 7000 7002 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7001 7003 -e 's:$: $lt_compiler_flag:'` 7002 - (eval echo "\"\$as_me:7002: $lt_compile\"" >&5) 7004 + (eval echo "\"\$as_me:7004: $lt_compile\"" >&5) 7003 7005 (eval "$lt_compile" 2>conftest.err) 7004 7006 ac_status=$? 7005 7007 cat conftest.err >&5 7006 - echo "$as_me:7006: \$? = $ac_status" >&5 7008 + echo "$as_me:7008: \$? = $ac_status" >&5 7007 7009 if (exit $ac_status) && test -s "$ac_outfile"; then 7008 7010 # The compiler can only warn and ignore the option if not recognized 7009 7011 # So say no if there are warnings other than the usual output. 7010 7012 $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp 7011 7013 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 7012 7014 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then 7013 7015 lt_cv_prog_compiler_pic_works=yes ................................................................................ 7100 7102 # (2) before a word containing "conftest.", or (3) at the end. 7101 7103 # Note that $ac_compile itself does not contain backslashes and begins 7102 7104 # with a dollar sign (not a hyphen), so the echo should work correctly. 7103 7105 lt_compile=`echo "$ac_compile" | $SED \ 7104 7106 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 7105 7107 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7106 7108 -e 's:$: $lt_compiler_flag:'` 7107 - (eval echo "\"\$as_me:7107: $lt_compile\"" >&5) 7109 + (eval echo "\"\$as_me:7109: $lt_compile\"" >&5) 7108 7110 (eval "$lt_compile" 2>out/conftest.err) 7109 7111 ac_status=$? 7110 7112 cat out/conftest.err >&5 7111 - echo "$as_me:7111: \$? = $ac_status" >&5 7113 + echo "$as_me:7113: \$? = $ac_status" >&5 7112 7114 if (exit $ac_status) && test -s out/conftest2.$ac_objext 7113 7115 then 7114 7116 # The compiler can only warn and ignore the option if not recognized 7115 7117 # So say no if there are warnings 7116 7118 $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp 7117 7119 $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 7118 7120 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ................................................................................ 7155 7157 # (2) before a word containing "conftest.", or (3) at the end. 7156 7158 # Note that $ac_compile itself does not contain backslashes and begins 7157 7159 # with a dollar sign (not a hyphen), so the echo should work correctly. 7158 7160 lt_compile=`echo "$ac_compile" | $SED \ 7159 7161 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 7160 7162 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7161 7163 -e 's:$: $lt_compiler_flag:'` 7162 - (eval echo "\"\$as_me:7162: $lt_compile\"" >&5) 7164 + (eval echo "\"\$as_me:7164: $lt_compile\"" >&5) 7163 7165 (eval "$lt_compile" 2>out/conftest.err) 7164 7166 ac_status=$? 7165 7167 cat out/conftest.err >&5 7166 - echo "$as_me:7166: \$? = $ac_status" >&5 7168 + echo "$as_me:7168: \$? = $ac_status" >&5 7167 7169 if (exit $ac_status) && test -s out/conftest2.$ac_objext 7168 7170 then 7169 7171 # The compiler can only warn and ignore the option if not recognized 7170 7172 # So say no if there are warnings 7171 7173 $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp 7172 7174 $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 7173 7175 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ................................................................................ 9535 9537 else 9536 9538 if test "$cross_compiling" = yes; then : 9537 9539 lt_cv_dlopen_self=cross 9538 9540 else 9539 9541 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9540 9542 lt_status=$lt_dlunknown 9541 9543 cat > conftest.$ac_ext <<_LT_EOF 9542 -#line 9542 "configure" 9544 +#line 9544 "configure" 9543 9545 #include "confdefs.h" 9544 9546 9545 9547 #if HAVE_DLFCN_H 9546 9548 #include <dlfcn.h> 9547 9549 #endif 9548 9550 9549 9551 #include <stdio.h> ................................................................................ 9631 9633 else 9632 9634 if test "$cross_compiling" = yes; then : 9633 9635 lt_cv_dlopen_self_static=cross 9634 9636 else 9635 9637 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 9636 9638 lt_status=$lt_dlunknown 9637 9639 cat > conftest.$ac_ext <<_LT_EOF 9638 -#line 9638 "configure" 9640 +#line 9640 "configure" 9639 9641 #include "confdefs.h" 9640 9642 9641 9643 #if HAVE_DLFCN_H 9642 9644 #include <dlfcn.h> 9643 9645 #endif 9644 9646 9645 9647 #include <stdio.h> ................................................................................ 11489 11491 else 11490 11492 enable_rtree=no 11491 11493 fi 11492 11494 11493 11495 if test "${enable_rtree}" = "yes" ; then 11494 11496 OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_RTREE" 11495 11497 fi 11498 + 11499 +######### 11500 +# See whether we should enable the SESSION extension 11501 +# Check whether --enable-session was given. 11502 +if test "${enable_session+set}" = set; then : 11503 + enableval=$enable_session; enable_session=yes 11504 +else 11505 + enable_session=no 11506 +fi 11507 + 11508 +if test "${enable_session}" = "yes" ; then 11509 + OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_SESSION" 11510 + OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_PREUPDATE_HOOK" 11511 +fi 11496 11512 11497 11513 ######### 11498 11514 # attempt to duplicate any OMITS and ENABLES into the $(OPT_FEATURE_FLAGS) parameter 11499 11515 for option in $CFLAGS $CPPFLAGS 11500 11516 do 11501 11517 case $option in 11502 11518 -DSQLITE_OMIT*) OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS $option";;
Changes to configure.ac.
610 610 # See whether we should enable RTREE 611 611 AC_ARG_ENABLE(rtree, AC_HELP_STRING([--enable-rtree], 612 612 [Enable the RTREE extension]), 613 613 [enable_rtree=yes],[enable_rtree=no]) 614 614 if test "${enable_rtree}" = "yes" ; then 615 615 OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_RTREE" 616 616 fi 617 + 618 +######### 619 +# See whether we should enable the SESSION extension 620 +AC_ARG_ENABLE(session, AC_HELP_STRING([--enable-session], 621 + [Enable the SESSION extension]), 622 + [enable_session=yes],[enable_session=no]) 623 +if test "${enable_session}" = "yes" ; then 624 + OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_SESSION" 625 + OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_PREUPDATE_HOOK" 626 +fi 617 627 618 628 ######### 619 629 # attempt to duplicate any OMITS and ENABLES into the $(OPT_FEATURE_FLAGS) parameter 620 630 for option in $CFLAGS $CPPFLAGS 621 631 do 622 632 case $option in 623 633 -DSQLITE_OMIT*) OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS $option";;
Changes to test/releasetest.tcl.
47 47 return $out 48 48 } 49 49 50 50 array set ::Configs [strip_comments { 51 51 "Default" { 52 52 -O2 53 53 --disable-amalgamation --disable-shared 54 + --enable-session 54 55 } 55 56 "Sanitize" { 56 57 CC=clang -fsanitize=undefined 57 58 -DSQLITE_ENABLE_STAT4 59 + --enable-session 58 60 } 59 61 "Have-Not" { 60 62 # The "Have-Not" configuration sets all possible -UHAVE_feature options 61 63 # in order to verify that the code works even on platforms that lack 62 64 # these support services. 63 65 -DHAVE_FDATASYNC=0 64 66 -DHAVE_GMTIME_R=0 ................................................................................ 102 104 -DSQLITE_SECURE_DELETE=1 103 105 -DSQLITE_SOUNDEX=1 104 106 -DSQLITE_ENABLE_ATOMIC_WRITE=1 105 107 -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1 106 108 -DSQLITE_ENABLE_OVERSIZE_CELL_CHECK=1 107 109 -DSQLITE_ENABLE_STAT4 108 110 -DSQLITE_ENABLE_STMT_SCANSTATUS 109 - --enable-json1 --enable-fts5 111 + --enable-json1 --enable-fts5 --enable-session 110 112 } 111 113 "Debug-One" { 112 114 --disable-shared 113 115 -O2 114 116 -DSQLITE_DEBUG=1 115 117 -DSQLITE_MEMDEBUG=1 116 118 -DSQLITE_MUTEX_NOOP=1 ................................................................................ 128 130 -O6 129 131 -DSQLITE_ENABLE_FTS4=1 130 132 -DSQLITE_ENABLE_RTREE=1 131 133 -DSQLITE_ENABLE_STAT4 132 134 -DSQLITE_ENABLE_RBU 133 135 -DSQLITE_MAX_ATTACHED=125 134 136 -DLONGDOUBLE_TYPE=double 137 + --enable-session 135 138 } 136 139 "Device-One" { 137 140 -O2 138 141 -DSQLITE_DEBUG=1 139 142 -DSQLITE_DEFAULT_AUTOVACUUM=1 140 143 -DSQLITE_DEFAULT_CACHE_SIZE=64 141 144 -DSQLITE_DEFAULT_PAGE_SIZE=1024 ................................................................................ 164 167 -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1 165 168 -DSQLITE_ENABLE_RTREE=1 166 169 -DSQLITE_MAX_COMPOUND_SELECT=50 167 170 -DSQLITE_MAX_PAGE_SIZE=32768 168 171 -DSQLITE_OMIT_TRACE=1 169 172 -DSQLITE_TEMP_STORE=3 170 173 -DSQLITE_THREADSAFE=2 171 - --enable-json1 --enable-fts5 174 + --enable-json1 --enable-fts5 --enable-session 172 175 } 173 176 "Locking-Style" { 174 177 -O2 175 178 -DSQLITE_ENABLE_LOCKING_STYLE=1 176 179 } 177 180 "Apple" { 178 181 -O1 # Avoid a compiler bug in gcc 4.2.1 build 5658