Fossil SCM

Update the built-in SQLite to the second release candidate for 3.8.2.

drh 2013-12-03 15:25 UTC trunk

Commit d7543d8bbd92ab649903c712614837a3e498a8df

Parent 2d2ab567547e1e4…

2 files changed +4 -7 +1 -1

M src/sqlite3.c

+4 -7

		--- src/sqlite3.c
		+++ src/sqlite3.c
		@@ -135,11 +135,11 @@
135	135	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
136	136	** [sqlite_version()] and [sqlite_source_id()].
137	137	*/
138	138	#define SQLITE_VERSION "3.8.2"
139	139	#define SQLITE_VERSION_NUMBER 3008002
140		-#define SQLITE_SOURCE_ID "2013-12-03 02:52:11 7d99858bec699dface548c77649dfc50e7fb50d8"
	140	+#define SQLITE_SOURCE_ID "2013-12-03 10:35:00 e4164fd8f75ce1c8d63bec70db7049b68208c12c"
141	141
142	142	/*
143	143	** CAPI3REF: Run-Time Library Version Numbers
144	144	** KEYWORDS: sqlite3_version, sqlite3_sourceid
145	145	**
		@@ -64125,11 +64125,12 @@
64125	64125
64126	64126	idx1 = getVarint32(aKey1, szHdr1);
64127	64127	d1 = szHdr1;
64128	64128	assert( pKeyInfo->nField+pKeyInfo->nXField>=pPKey2->nField \|\| CORRUPT_DB );
64129	64129	assert( pKeyInfo->aSortOrder!=0 );
64130		- assert( (idx1<=szHdr1 && i<pPKey2->nField) \|\| CORRUPT_DB );
	64130	+ assert( pKeyInfo->nField>0 );
	64131	+ assert( idx1<=szHdr1 \|\| CORRUPT_DB );
64131	64132	do{
64132	64133	u32 serial_type1;
64133	64134
64134	64135	/* Read the serial types for the next element in each key. */
64135	64136	idx1 += getVarint32( aKey1+idx1, serial_type1 );
		@@ -106290,15 +106291,11 @@
106290	106291	/* If changing the record number, delete the old record. */
106291	106292	if( hasFK \|\| chngKey \|\| pPk!=0 ){
106292	106293	sqlite3VdbeAddOp2(v, OP_Delete, iDataCur, 0);
106293	106294	}
106294	106295	if( bReplace \|\| chngKey ){
106295		- if( sqlite3VdbeCurrentAddr(v)==j1+1 ){
106296		- sqlite3VdbeChangeToNoop(v, j1);
106297		- }else{
106298		- sqlite3VdbeJumpHere(v, j1);
106299		- }
	106296	+ sqlite3VdbeJumpHere(v, j1);
106300	106297	}
106301	106298
106302	106299	if( hasFK ){
106303	106300	sqlite3FkCheck(pParse, pTab, 0, regNewRowid, aXRef, chngKey);
106304	106301	}
106305	106302

	--- src/sqlite3.c
	+++ src/sqlite3.c
	@@ -135,11 +135,11 @@
135	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
136	** [sqlite_version()] and [sqlite_source_id()].
137	*/
138	#define SQLITE_VERSION "3.8.2"
139	#define SQLITE_VERSION_NUMBER 3008002
140	#define SQLITE_SOURCE_ID "2013-12-03 02:52:11 7d99858bec699dface548c77649dfc50e7fb50d8"
141
142	/*
143	** CAPI3REF: Run-Time Library Version Numbers
144	** KEYWORDS: sqlite3_version, sqlite3_sourceid
145	**
	@@ -64125,11 +64125,12 @@
64125
64126	idx1 = getVarint32(aKey1, szHdr1);
64127	d1 = szHdr1;
64128	assert( pKeyInfo->nField+pKeyInfo->nXField>=pPKey2->nField \|\| CORRUPT_DB );
64129	assert( pKeyInfo->aSortOrder!=0 );
64130	assert( (idx1<=szHdr1 && i<pPKey2->nField) \|\| CORRUPT_DB );

64131	do{
64132	u32 serial_type1;
64133
64134	/* Read the serial types for the next element in each key. */
64135	idx1 += getVarint32( aKey1+idx1, serial_type1 );
	@@ -106290,15 +106291,11 @@
106290	/* If changing the record number, delete the old record. */
106291	if( hasFK \|\| chngKey \|\| pPk!=0 ){
106292	sqlite3VdbeAddOp2(v, OP_Delete, iDataCur, 0);
106293	}
106294	if( bReplace \|\| chngKey ){
106295	if( sqlite3VdbeCurrentAddr(v)==j1+1 ){
106296	sqlite3VdbeChangeToNoop(v, j1);
106297	}else{
106298	sqlite3VdbeJumpHere(v, j1);
106299	}
106300	}
106301
106302	if( hasFK ){
106303	sqlite3FkCheck(pParse, pTab, 0, regNewRowid, aXRef, chngKey);
106304	}
106305

	--- src/sqlite3.c
	+++ src/sqlite3.c
	@@ -135,11 +135,11 @@
135	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
136	** [sqlite_version()] and [sqlite_source_id()].
137	*/
138	#define SQLITE_VERSION "3.8.2"
139	#define SQLITE_VERSION_NUMBER 3008002
140	#define SQLITE_SOURCE_ID "2013-12-03 10:35:00 e4164fd8f75ce1c8d63bec70db7049b68208c12c"
141
142	/*
143	** CAPI3REF: Run-Time Library Version Numbers
144	** KEYWORDS: sqlite3_version, sqlite3_sourceid
145	**
	@@ -64125,11 +64125,12 @@
64125
64126	idx1 = getVarint32(aKey1, szHdr1);
64127	d1 = szHdr1;
64128	assert( pKeyInfo->nField+pKeyInfo->nXField>=pPKey2->nField \|\| CORRUPT_DB );
64129	assert( pKeyInfo->aSortOrder!=0 );
64130	assert( pKeyInfo->nField>0 );
64131	assert( idx1<=szHdr1 \|\| CORRUPT_DB );
64132	do{
64133	u32 serial_type1;
64134
64135	/* Read the serial types for the next element in each key. */
64136	idx1 += getVarint32( aKey1+idx1, serial_type1 );
	@@ -106290,15 +106291,11 @@
106291	/* If changing the record number, delete the old record. */
106292	if( hasFK \|\| chngKey \|\| pPk!=0 ){
106293	sqlite3VdbeAddOp2(v, OP_Delete, iDataCur, 0);
106294	}
106295	if( bReplace \|\| chngKey ){
106296	sqlite3VdbeJumpHere(v, j1);




106297	}
106298
106299	if( hasFK ){
106300	sqlite3FkCheck(pParse, pTab, 0, regNewRowid, aXRef, chngKey);
106301	}
106302

M src/sqlite3.h

+1 -1

		--- src/sqlite3.h
		+++ src/sqlite3.h
		@@ -107,11 +107,11 @@
107	107	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108	108	** [sqlite_version()] and [sqlite_source_id()].
109	109	*/
110	110	#define SQLITE_VERSION "3.8.2"
111	111	#define SQLITE_VERSION_NUMBER 3008002
112		-#define SQLITE_SOURCE_ID "2013-12-03 02:52:11 7d99858bec699dface548c77649dfc50e7fb50d8"
	112	+#define SQLITE_SOURCE_ID "2013-12-03 10:35:00 e4164fd8f75ce1c8d63bec70db7049b68208c12c"
113	113
114	114	/*
115	115	** CAPI3REF: Run-Time Library Version Numbers
116	116	** KEYWORDS: sqlite3_version, sqlite3_sourceid
117	117	**
118	118

	--- src/sqlite3.h
	+++ src/sqlite3.h
	@@ -107,11 +107,11 @@
107	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108	** [sqlite_version()] and [sqlite_source_id()].
109	*/
110	#define SQLITE_VERSION "3.8.2"
111	#define SQLITE_VERSION_NUMBER 3008002
112	#define SQLITE_SOURCE_ID "2013-12-03 02:52:11 7d99858bec699dface548c77649dfc50e7fb50d8"
113
114	/*
115	** CAPI3REF: Run-Time Library Version Numbers
116	** KEYWORDS: sqlite3_version, sqlite3_sourceid
117	**
118

	--- src/sqlite3.h
	+++ src/sqlite3.h
	@@ -107,11 +107,11 @@
107	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108	** [sqlite_version()] and [sqlite_source_id()].
109	*/
110	#define SQLITE_VERSION "3.8.2"
111	#define SQLITE_VERSION_NUMBER 3008002
112	#define SQLITE_SOURCE_ID "2013-12-03 10:35:00 e4164fd8f75ce1c8d63bec70db7049b68208c12c"
113
114	/*
115	** CAPI3REF: Run-Time Library Version Numbers
116	** KEYWORDS: sqlite3_version, sqlite3_sourceid
117	**
118

Fossil SCM

Keyboard Shortcuts