OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Jan-2005 16:25:19
Branch: HEAD Handle: 2005010515251900
Modified files:
openpkg-src/ripe-dbase ripe-dbase.patch ripe-dbase.spec
Log:
duplicate primary keys are generated by STRAIGHT_JOIN selections, so
work around subsequent broken sql INSERT logic with IGNORE to allow
for MySQL's 4.1.X more strict (ISO standard?) database operations
Summary:
Revision Changes Path
1.4 +13 -0 openpkg-src/ripe-dbase/ripe-dbase.patch
1.41 +1 -1 openpkg-src/ripe-dbase/ripe-dbase.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ripe-dbase/ripe-dbase.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 ripe-dbase.patch
--- openpkg-src/ripe-dbase/ripe-dbase.patch 11 Dec 2003 16:25:24 -0000
1.3
+++ openpkg-src/ripe-dbase/ripe-dbase.patch 5 Jan 2005 15:25:19 -0000
1.4
@@ -36,6 +36,19 @@
#else/* default is Solaris implementation */
hptr=gethostbyname_r(nrtm->server, &result, host_info, sizeof(host_info),
&error);
#endif
+Index: modules/qi/query_instructions.h
+diff -Nau modules/qi/query_instructions.h.orig
modules/qi/query_instructions.h
+--- modules/qi/query_instructions.h.orig 2005-01-05 13:34:01 +0100
++++ modules/qi/query_instructions.h 2005-01-05 13:34:21 +0100
+@@ -92,7 +92,7 @@
+
+
+
+-#define Q_REC "INSERT INTO %s SELECT pe_ro_id FROM %s IDS
STRAIGHT_JOIN %s WHERE object_id = IDS.id"
++#define Q_REC "INSERT IGNORE INTO %s SELECT pe_ro_id FROM %s IDS
STRAIGHT_JOIN %s WHERE object_id = IDS.id"
+
+ #if 0
+ #define Q_NO_OBJECTS "SELECT object_id, sequence_id, object FROM last
WHERE object_id = 0"
Index: Makefile.site.in
diff -Nau Makefile.site.in.orig Makefile.site.in
--- Makefile.site.in.orig Wed Jul 30 10:17:29 2003
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ripe-dbase/ripe-dbase.spec
============================================================================
$ cvs diff -u -r1.40 -r1.41 ripe-dbase.spec
--- openpkg-src/ripe-dbase/ripe-dbase.spec 1 Jan 2005 10:54:23 -0000
1.40
+++ openpkg-src/ripe-dbase/ripe-dbase.spec 5 Jan 2005 15:25:19 -0000
1.41
@@ -34,7 +34,7 @@
Group: Database
License: RIPE NCC
Version: 3.2.0
-Release: 20041028
+Release: 20050105
# package options
%option with_extobjs no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
