Accepting request 120904 from server:database

- Add upstream commit 79a4a3a84f to fix subversion failures

OBS-URL: https://build.opensuse.org/request/show/120904
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sqlite3?expand=0&rev=43
This commit is contained in:
Stephan Kulow 2012-05-21 05:55:50 +00:00 committed by Git OBS Bridge
commit 833bca73ea
3 changed files with 24 additions and 0 deletions

17
79a4a3a84f.patch Normal file
View File

@ -0,0 +1,17 @@
Index: sqlite-autoconf-3071100/sqlite3.c
===================================================================
--- sqlite-autoconf-3071100.orig/sqlite3.c
+++ sqlite-autoconf-3071100/sqlite3.c
@@ -67595,8 +67595,10 @@ case OP_Savepoint: {
rc = p->rc;
}else{
u.ar.iSavepoint = db->nSavepoint - u.ar.iSavepoint - 1;
- for(u.ar.ii=0; u.ar.ii<db->nDb; u.ar.ii++){
- sqlite3BtreeTripAllCursors(db->aDb[u.ar.ii].pBt, SQLITE_ABORT);
+ if( u.ar.p1==SAVEPOINT_ROLLBACK ){
+ for(u.ar.ii=0; u.ar.ii<db->nDb; u.ar.ii++){
+ sqlite3BtreeTripAllCursors(db->aDb[u.ar.ii].pBt, SQLITE_ABORT);
+ }
}
for(u.ar.ii=0; u.ar.ii<db->nDb; u.ar.ii++){
rc = sqlite3BtreeSavepoint(db->aDb[u.ar.ii].pBt, u.ar.p1, u.ar.iSavepoint);

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 14 09:53:58 UTC 2012 - idonmez@suse.com
- Add upstream commit 79a4a3a84f to fix subversion failures
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 4 06:49:49 UTC 2012 - max@suse.com Fri May 4 06:49:49 UTC 2012 - max@suse.com

View File

@ -37,6 +37,7 @@ Provides: sqlite = %version
Obsoletes: sqlite < %version Obsoletes: sqlite < %version
Source0: sqlite-autoconf-%tarversion.tar.gz Source0: sqlite-autoconf-%tarversion.tar.gz
Source1: baselibs.conf Source1: baselibs.conf
Patch1: 79a4a3a84f.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
@ -112,6 +113,7 @@ database access without running a separate RDBMS process.
%prep %prep
%setup -q -n sqlite-autoconf-%tarversion %setup -q -n sqlite-autoconf-%tarversion
%patch1 -p1
%build %build
export CFLAGS="-DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_USE_URI" export CFLAGS="-DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_USE_URI"