Skip to content

Commit 95bb90e

Browse files
developernotesdevelopernotes
committed
Merge sqlite-release(3.8.0.2) into prerelease-integration
Conflicts: configure
2 parents ccb36a0 + 0b3ee44 commit 95bb90e

6 files changed

Lines changed: 52 additions & 22 deletions

File tree

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.8.0.1
1+
3.8.0.2

‎configure‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.62 for sqlcipher 3.8.0.1.
3+
# Generated by GNU Autoconf 2.62 for sqlcipher 3.8.0.2.
44
#
55
# This configure script is free software; the Free Software Foundation
66
# gives unlimited permission to copy, distribute and modify it.
@@ -722,8 +722,8 @@ MAKEFLAGS=
722722
# Identity of this package.
723723
PACKAGE_NAME='sqlcipher'
724724
PACKAGE_TARNAME='sqlcipher'
725-
PACKAGE_VERSION='3.8.0.1'
726-
PACKAGE_STRING='sqlcipher 3.8.0.1'
725+
PACKAGE_VERSION='3.8.0.2'
726+
PACKAGE_STRING='sqlcipher 3.8.0.2'
727727
PACKAGE_BUGREPORT=''
728728
PACKAGE_URL=''
729729

@@ -1454,7 +1454,7 @@ if test "$ac_init_help" = "long"; then
14541454
# Omit some internal or obsolete options to make the list less imposing.
14551455
# This message is too long to be a string in the A/UX 3.1 sh.
14561456
cat <<_ACEOF
1457-
\`configure' configures sqlcipher 3.8.0.1 to adapt to many kinds of systems.
1457+
\`configure' configures sqlcipher 3.8.0.2 to adapt to many kinds of systems.
14581458
14591459
Usage: $0 [OPTION]... [VAR=VALUE]...
14601460
@@ -1519,7 +1519,7 @@ fi
15191519

15201520
if test -n "$ac_init_help"; then
15211521
case $ac_init_help in
1522-
short | recursive ) echo "Configuration of sqlcipher 3.8.0.1:";;
1522+
short | recursive ) echo "Configuration of sqlcipher 3.8.0.2:";;
15231523
esac
15241524
cat <<\_ACEOF
15251525
@@ -1637,7 +1637,7 @@ fi
16371637
test -n "$ac_init_help" && exit $ac_status
16381638
if $ac_init_version; then
16391639
cat <<\_ACEOF
1640-
sqlcipher configure 3.8.0.1
1640+
sqlcipher configure 3.8.0.2
16411641
generated by GNU Autoconf 2.62
16421642
16431643
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1647,7 +1647,7 @@ _ACEOF
16471647
exit
16481648
fi
16491649
1650-
It was created by sqlcipher $as_me 3.8.0.1, which was
1650+
It was created by sqlcipher $as_me 3.8.0.2, which was
16511651
generated by GNU Autoconf 2.62. Invocation command line was
16521652
16531653
# ac_fn_c_try_compile LINENO
@@ -12000,7 +12000,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1200012000
# report actual input values of CONFIG_FILES etc. instead of their
1200112001
# values after options handling.
1200212002
ac_log="
12003-
This file was extended by sqlcipher $as_me 3.8.0.1, which was
12003+
This file was extended by sqlcipher $as_me 3.8.0.2, which was
1200412004
generated by GNU Autoconf 2.62. Invocation command line was
1200512005
1200612006
CONFIG_FILES = $CONFIG_FILES
@@ -12066,7 +12066,7 @@ _ACEOF
1206612066
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1206712067
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1206812068
ac_cs_version="\\
12069-
sqlcipher config.status 3.8.0.1
12069+
sqlcipher config.status 3.8.0.2
1207012070
configured by $0, generated by GNU Autoconf 2.62,
1207112071
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
1207212072

‎manifest‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
C Version\s3.8.0.1
2-
D 2013-08-29T17:35:01.986
1+
C Version\s3.8.0.2
2+
D 2013-09-03T17:11:13.470
33
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
44
F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
55
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
66
F Makefile.msc e9f41f89111627baaabd95cab4988b8d1c3e47c9
77
F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
88
F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
9-
F VERSION 087a4ef56b220aeb0fbef8ae45871be9668cd970
9+
F VERSION 8a3318c35d2fac7dcd542c90622f5ff9d7cfa096
1010
F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
1111
F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
1212
F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@ -38,7 +38,7 @@ F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
3838
F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
3939
F config.h.in 0921066a13130082764ab4ab6456f7b5bebe56de
4040
F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
41-
F configure 9af276330ddd63041537a88323705690d02df76e x
41+
F configure 02db96d0755ede42eb3f985c29cc953d300f6995 x
4242
F configure.ac 81c43d151d0b0e406be056394cc9ff4cb3fd0444
4343
F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
4444
F doc/lemon.html 334dbf6621b8fb8790297ec1abf3cfa4621709d1
@@ -290,7 +290,7 @@ F src/vtab.c 165ce0e797c2cd23badb104c9f2ae9042d6d942c
290290
F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4
291291
F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
292292
F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
293-
F src/where.c a9ec7caba7697f152bd34853b98500dd54c4b240
293+
F src/where.c 51f55344b17165902969642928763ee5af9c9b63
294294
F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
295295
F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
296296
F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1039,7 +1039,7 @@ F test/walro.test 6cc247a0cc9b36aeea2057dd28a922a1cdfbd630
10391039
F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
10401040
F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
10411041
F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
1042-
F test/where.test da54153a4c1571ea1b95659e5bec8119edf786aa
1042+
F test/where.test 8d66dfbfd4d12816f74f854dbf67dee492c06267
10431043
F test/where2.test 76d5346f7edb2a6a0442dcf3e9d088ac6903e0b5
10441044
F test/where3.test d28c51f257e60be30f74308fa385ceeddfb54a6e
10451045
F test/where4.test e9b9e2f2f98f00379e6031db6a6fca29bae782a2
@@ -1106,9 +1106,10 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
11061106
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
11071107
F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
11081108
F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
1109-
P c5857808c0707baa30994dd6aa3b9c93a74c0073
1110-
R f09fdab74837e6353df38f5d2273681e
1109+
P cce541864d2216c875992fe22bcb009747f72128
1110+
R 6d234f3f24f580ee38bfe11d7feea18c
1111+
T +bgcolor * #d0c0ff
11111112
T +sym-release *
1112-
T +sym-version-3.8.0.1 *
1113+
T +sym-version-3.8.0.2 *
11131114
U drh
1114-
Z 3c028394a3a00a433c82a9881b010566
1115+
Z 25497eb59e96f82b9ae854b9bc7b7f22

‎manifest.uuid‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
352362bc01660edfbda08179d60f09e2038a2f49
1+
7dd4968f235d6e1ca9547cda9cf3bd570e1609ef

‎src/where.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5914,7 +5914,7 @@ WhereInfo *sqlite3WhereBegin(
59145914
&& OptimizationEnabled(db, SQLITE_OmitNoopJoin)
59155915
){
59165916
Bitmask tabUsed = exprListTableUsage(pMaskSet, pResultSet);
5917-
if( pOrderBy ) tabUsed |= exprListTableUsage(pMaskSet, pOrderBy);
5917+
if( sWLB.pOrderBy ) tabUsed |= exprListTableUsage(pMaskSet, sWLB.pOrderBy);
59185918
while( pWInfo->nLevel>=2 ){
59195919
WhereTerm *pTerm, *pEnd;
59205920
pLoop = pWInfo->a[pWInfo->nLevel-1].pWLoop;

‎test/where.test‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1304,4 +1304,33 @@ do_test where-17.5 {
13041304
}
13051305
} {42 1 43 1}
13061306

1307+
# Ticket [be84e357c035d068135f20bcfe82761bbf95006b] 2013-09-03
1308+
# Segfault during query involving LEFT JOIN column in the ORDER BY clause.
1309+
#
1310+
do_execsql_test where-18.1 {
1311+
CREATE TABLE t181(a);
1312+
CREATE TABLE t182(b,c);
1313+
INSERT INTO t181 VALUES(1);
1314+
SELECT DISTINCT a FROM t181 LEFT JOIN t182 ON a=b ORDER BY c IS NULL;
1315+
} {1}
1316+
do_execsql_test where-18.2 {
1317+
SELECT DISTINCT a FROM t181 LEFT JOIN t182 ON a=b ORDER BY +c;
1318+
} {1}
1319+
do_execsql_test where-18.3 {
1320+
SELECT DISTINCT a FROM t181 LEFT JOIN t182 ON a=b ORDER BY c;
1321+
} {1}
1322+
do_execsql_test where-18.4 {
1323+
INSERT INTO t181 VALUES(1),(1),(1),(1);
1324+
SELECT DISTINCT a FROM t181 LEFT JOIN t182 ON a=b ORDER BY +c;
1325+
} {1}
1326+
do_execsql_test where-18.5 {
1327+
INSERT INTO t181 VALUES(2);
1328+
SELECT DISTINCT a FROM t181 LEFT JOIN t182 ON a=b ORDER BY c IS NULL, +a;
1329+
} {1 2}
1330+
do_execsql_test where-18.6 {
1331+
INSERT INTO t181 VALUES(2);
1332+
SELECT DISTINCT a FROM t181 LEFT JOIN t182 ON a=b ORDER BY +a, +c IS NULL;
1333+
} {1 2}
1334+
1335+
13071336
finish_test

0 commit comments

Comments
 (0)