r11804 - in /trunk/libdbd-mysql-perl: ./ debian/ eg/ lib/DBD/ t/

gregoa-guest at users.alioth.debian.org gregoa-guest at users.alioth.debian.org
Fri Dec 28 18:38:37 UTC 2007 

Author: gregoa-guest
Date: Fri Dec 28 18:38:37 2007
New Revision: 11804

URL: http://svn.debian.org/wsvn/?sc=1&rev=11804
Log:
New upstream release.

Added:
    trunk/libdbd-mysql-perl/eg/._bug14979.pl
      - copied unchanged from r11803, branches/upstream/libdbd-mysql-perl/current/eg/._bug14979.pl
    trunk/libdbd-mysql-perl/eg/._bug21028.pl
      - copied unchanged from r11803, branches/upstream/libdbd-mysql-perl/current/eg/._bug21028.pl
    trunk/libdbd-mysql-perl/eg/bug14979.pl
      - copied unchanged from r11803, branches/upstream/libdbd-mysql-perl/current/eg/bug14979.pl
    trunk/libdbd-mysql-perl/eg/bug21028.pl
      - copied unchanged from r11803, branches/upstream/libdbd-mysql-perl/current/eg/bug21028.pl
    trunk/libdbd-mysql-perl/eg/bug30033.pl
      - copied unchanged from r11803, branches/upstream/libdbd-mysql-perl/current/eg/bug30033.pl
    trunk/libdbd-mysql-perl/eg/bug30033pg.pl
      - copied unchanged from r11803, branches/upstream/libdbd-mysql-perl/current/eg/bug30033pg.pl
    trunk/libdbd-mysql-perl/eg/decimal_test.pl
      - copied unchanged from r11803, branches/upstream/libdbd-mysql-perl/current/eg/decimal_test.pl
    trunk/libdbd-mysql-perl/eg/issue21946.pl
      - copied unchanged from r11803, branches/upstream/libdbd-mysql-perl/current/eg/issue21946.pl
    trunk/libdbd-mysql-perl/eg/proc_example2a.pl
      - copied unchanged from r11803, branches/upstream/libdbd-mysql-perl/current/eg/proc_example2a.pl
    trunk/libdbd-mysql-perl/eg/proc_example2b.pl
      - copied unchanged from r11803, branches/upstream/libdbd-mysql-perl/current/eg/proc_example2b.pl
    trunk/libdbd-mysql-perl/eg/proc_example4.pl
      - copied unchanged from r11803, branches/upstream/libdbd-mysql-perl/current/eg/proc_example4.pl
    trunk/libdbd-mysql-perl/t/25lockunlock.t
      - copied unchanged from r11803, branches/upstream/libdbd-mysql-perl/current/t/25lockunlock.t
    trunk/libdbd-mysql-perl/t/40keyinfo.t
      - copied unchanged from r11803, branches/upstream/libdbd-mysql-perl/current/t/40keyinfo.t
    trunk/libdbd-mysql-perl/t/40server_prepare.t
      - copied unchanged from r11803, branches/upstream/libdbd-mysql-perl/current/t/40server_prepare.t
    trunk/libdbd-mysql-perl/t/40types.t
      - copied unchanged from r11803, branches/upstream/libdbd-mysql-perl/current/t/40types.t
    trunk/libdbd-mysql-perl/t/65types.t
      - copied unchanged from r11803, branches/upstream/libdbd-mysql-perl/current/t/65types.t
    trunk/libdbd-mysql-perl/t/test.pl
      - copied unchanged from r11803, branches/upstream/libdbd-mysql-perl/current/t/test.pl
    trunk/libdbd-mysql-perl/t/test_data.txt
      - copied unchanged from r11803, branches/upstream/libdbd-mysql-perl/current/t/test_data.txt
    trunk/libdbd-mysql-perl/t/warnings.t
      - copied unchanged from r11803, branches/upstream/libdbd-mysql-perl/current/t/warnings.t
Modified:
    trunk/libdbd-mysql-perl/ChangeLog
    trunk/libdbd-mysql-perl/INSTALL.html
    trunk/libdbd-mysql-perl/MANIFEST
    trunk/libdbd-mysql-perl/META.yml
    trunk/libdbd-mysql-perl/constants.h
    trunk/libdbd-mysql-perl/dbdimp.c
    trunk/libdbd-mysql-perl/dbdimp.h
    trunk/libdbd-mysql-perl/debian/changelog
    trunk/libdbd-mysql-perl/lib/DBD/mysql.pm
    trunk/libdbd-mysql-perl/t/40bindparam2.t
    trunk/libdbd-mysql-perl/t/41bindparam.t
    trunk/libdbd-mysql-perl/t/42bindparam.t
    trunk/libdbd-mysql-perl/t/texecute.t

Modified: trunk/libdbd-mysql-perl/ChangeLog
URL: http://svn.debian.org/wsvn/trunk/libdbd-mysql-perl/ChangeLog?rev=11804&op=diff
==============================================================================
--- trunk/libdbd-mysql-perl/ChangeLog (original)
+++ trunk/libdbd-mysql-perl/ChangeLog Fri Dec 28 18:38:37 2007
@@ -1,3 +1,9 @@
+2007-12-26 Patrick Galbraith <patg at grazr.com> (4.006)
+
+* Cleanups on OS X compile
+* Fixes to syntax errors on AIX
+* Removed test code that was leaving trace files around
+
 2007-3-22 Patrick Galbraith <patg at grazr.com> (4.005)
 
 * Fixed mysql_warning issue < 4.1 (reminers, patches, help from ROAM, (issue 25713)
@@ -1063,7 +1069,7 @@
 	* lib/Msql/Statement.pm: Fixed use of Msql::TEXT_TYPE without
 	  checking whether we are running Msql 1.
 
-$Id: ChangeLog 9634 2007-06-08 12:57:29Z capttofu $
+$Id: ChangeLog 10459 2007-12-26 22:34:21Z capttofu $
 
 DBD::mysql for DBI - Written by Jochen Wiedmann <joe at ispsoft.de>
 

Modified: trunk/libdbd-mysql-perl/INSTALL.html
URL: http://svn.debian.org/wsvn/trunk/libdbd-mysql-perl/INSTALL.html?rev=11804&op=diff
==============================================================================
--- trunk/libdbd-mysql-perl/INSTALL.html (original)
+++ trunk/libdbd-mysql-perl/INSTALL.html Fri Dec 28 18:38:37 2007
@@ -4,7 +4,7 @@
 <head>
 <title>INSTALL - How to install and configure DBD::mysql</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rev="made" href="mailto:patg at radha.local" />
+<link rev="made" href="mailto:patg at my.patg.net" />
 </head>
 
 <body style="background-color: white">

Modified: trunk/libdbd-mysql-perl/MANIFEST
URL: http://svn.debian.org/wsvn/trunk/libdbd-mysql-perl/MANIFEST?rev=11804&op=diff
==============================================================================
--- trunk/libdbd-mysql-perl/MANIFEST (original)
+++ trunk/libdbd-mysql-perl/MANIFEST Fri Dec 28 18:38:37 2007
@@ -1,3 +1,20 @@
+eg/bug14979.pl
+eg/bug21028.pl
+eg/bug30033.pl
+eg/bug30033pg.pl
+eg/decimal_test.pl
+eg/issue21946.pl
+eg/proc_example2a.pl
+eg/proc_example2b.pl
+eg/proc_example4.pl
+t/25lockunlock.t
+t/40keyinfo.t
+t/40server_prepare.t
+t/40types.t
+t/65types.t
+t/test.pl
+t/test_data.txt
+t/warnings.t
 t/00base.t
 t/10connect.t
 t/20createdrop.t

Modified: trunk/libdbd-mysql-perl/META.yml
URL: http://svn.debian.org/wsvn/trunk/libdbd-mysql-perl/META.yml?rev=11804&op=diff
==============================================================================
--- trunk/libdbd-mysql-perl/META.yml (original)
+++ trunk/libdbd-mysql-perl/META.yml Fri Dec 28 18:38:37 2007
@@ -1,7 +1,7 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         DBD-mysql
-version:      4.005
+version:      4.006
 version_from: lib/DBD/mysql.pm
 installdirs:  site
 requires:

Modified: trunk/libdbd-mysql-perl/constants.h
URL: http://svn.debian.org/wsvn/trunk/libdbd-mysql-perl/constants.h?rev=11804&op=diff
==============================================================================
--- trunk/libdbd-mysql-perl/constants.h (original)
+++ trunk/libdbd-mysql-perl/constants.h Fri Dec 28 18:38:37 2007
@@ -5,6 +5,7 @@
 
 static double mysql_constant(char* name, char* arg) {
   errno = 0;
+  arg= arg;
   switch (*name) {
   case 'B':
     if (strEQ(name, "BLOB_FLAG"))

Modified: trunk/libdbd-mysql-perl/dbdimp.c
URL: http://svn.debian.org/wsvn/trunk/libdbd-mysql-perl/dbdimp.c?rev=11804&op=diff
==============================================================================
--- trunk/libdbd-mysql-perl/dbdimp.c (original)
+++ trunk/libdbd-mysql-perl/dbdimp.c Fri Dec 28 18:38:37 2007
@@ -8,7 +8,7 @@
  *  You may distribute this under the terms of either the GNU General Public
  *  License or the Artistic License, as specified in the Perl README file.
  *
- *  $Id: dbdimp.c 9630 2007-06-07 12:14:00Z capttofu $
+ *  $Id: dbdimp.c 10412 2007-12-11 21:42:15Z capttofu $
  */
 
 
@@ -65,6 +65,8 @@
   char* ptr = statement;
   int num_params = 0;
   char c;
+  if (dbis->debug >= 2)
+    PerlIO_printf(DBILOGFP, ">count_params statement %s\n", statement);
 
   while ( (c = *ptr++) )
   {
@@ -107,7 +109,7 @@
   imp_sth_ph_t *params;
 
   if (num_params)
-    Newz(908, params, num_params, imp_sth_ph_t);
+    Newz(908, params, (unsigned int) num_params, imp_sth_ph_t);
   else
     params= NULL;
 
@@ -125,7 +127,7 @@
   MYSQL_BIND *bind;
 
   if (num_params)
-    Newz(908, bind, num_params, MYSQL_BIND);
+    Newz(908, bind, (unsigned int) num_params, MYSQL_BIND);
   else
     bind= NULL;
 
@@ -141,7 +143,7 @@
   imp_sth_phb_t *fbind;
 
   if (num_params)
-    Newz(908, fbind, num_params, imp_sth_phb_t);
+    Newz(908, fbind, (unsigned int) num_params, imp_sth_phb_t);
   else
     fbind= NULL;
 
@@ -156,7 +158,7 @@
   imp_sth_fbh_t *fbh;
 
   if (num_fields)
-    Newz(908, fbh, num_fields, imp_sth_fbh_t);
+    Newz(908, fbh, (unsigned int) num_fields, imp_sth_fbh_t);
   else
     fbh= NULL;
 
@@ -418,6 +420,9 @@
   int limit_flag= 0;
   STRLEN vallen;
   imp_sth_ph_t *ph;
+
+  if (dbis->debug >= 2)
+    PerlIO_printf(DBILOGFP, ">parse_params statement %s\n", statement);
 
   if (num_params == 0)
     return NULL;
@@ -1245,7 +1250,7 @@
   }
 #endif
 
-  DBIh_EVENT2(h, ERROR_event, DBIc_ERR(imp_xxh), errstr);
+  /* NO EFFECT DBIh_EVENT2(h, ERROR_event, DBIc_ERR(imp_xxh), errstr); */
   if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
     PerlIO_printf(DBILOGFP, "%s error %d recorded: %s\n",
     what, rc, SvPV(errstr,lna));
@@ -1264,7 +1269,7 @@
   SV *errstr = DBIc_ERRSTR(imp_xxh);
   sv_setiv(DBIc_ERR(imp_xxh), (IV)rc);	/* set err early	*/
   sv_setpv(errstr, what);
-  DBIh_EVENT2(h, WARN_event, DBIc_ERR(imp_xxh), errstr);
+  /* NO EFFECT DBIh_EVENT2(h, WARN_event, DBIc_ERR(imp_xxh), errstr);*/
   if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
     PerlIO_printf(DBILOGFP, "%s warning %d recorded: %s\n",
     what, rc, SvPV(errstr,lna));
@@ -1970,8 +1975,8 @@
     sv_setiv(DBIc_ERR(imp_drh), (IV)1);
     sv_setpv(DBIc_ERRSTR(imp_drh),
              (char*)"disconnect_all not implemented");
-    DBIh_EVENT2(drh, ERROR_event,
-                DBIc_ERR(imp_drh), DBIc_ERRSTR(imp_drh));
+    /* NO EFFECT DBIh_EVENT2(drh, ERROR_event,
+      DBIc_ERR(imp_drh), DBIc_ERRSTR(imp_drh)); */
     return FALSE;
   }
   perl_destruct_level = 0;
@@ -2155,17 +2160,13 @@
   return newSVpv(ptr, (buf+ sizeof(buf) - 1) - ptr);
 }
 
-SV*
-dbd_db_FETCH_attrib(
-                    SV* dbh,
-                    imp_dbh_t* imp_dbh,
-                    SV* keysv
-                   )
+SV* dbd_db_FETCH_attrib(SV *dbh, imp_dbh_t *imp_dbh, SV *keysv)
 {
   STRLEN kl;
   char *key = SvPV(keysv, kl);
   char* fine_key = NULL;
   SV* result = NULL;
+  dbh= dbh;
 
   switch (*key) {
     case 'A':
@@ -2335,8 +2336,8 @@
 
   if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
     PerlIO_printf(DBILOGFP,
-                 "\t-> dbd_st_prepare MYSQL_VERSION_ID %d\n",
-                  MYSQL_VERSION_ID);
+                 "\t-> dbd_st_prepare MYSQL_VERSION_ID %d, SQL statement: %s\n",
+                  MYSQL_VERSION_ID, statement);
 
 #if MYSQL_VERSION_ID >= SERVER_PREPARE_VERSION
  /* Set default value of 'mysql_server_prepare' attribute for sth from dbh */
@@ -2588,7 +2589,7 @@
     {
       if (!(imp_sth->result = mysql_use_result(&imp_dbh->mysql)))
       {
-        //Check for possible error
+        /* Check for possible error */
         if (mysql_field_count(&imp_dbh->mysql))
         {
           if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
@@ -2801,9 +2802,10 @@
   int htype;
   int errno;
   my_ulonglong rows= 0;
-
   /* thank you DBI.c for this info! */
   D_imp_xxh(h);
+  attribs= attribs;
+
   htype= DBIc_TYPE(imp_xxh);
   /*
     It is important to import imp_dbh properly according to the htype
@@ -4029,7 +4031,7 @@
         HV *pvhv= newHV();
         if (DBIc_NUM_PARAMS(imp_sth))
         {
-            unsigned int n;
+            int n;
             char key[100];
             I32 keylen;
             for (n= 0; n < DBIc_NUM_PARAMS(imp_sth); n++)
@@ -4149,6 +4151,14 @@
   SV *destrv,
   long destoffset)
 {
+    /* quell warnings */
+    sth= sth;
+    imp_sth=imp_sth;
+    field= field;
+    offset= offset;
+    len= len;
+    destrv= destrv;
+    destoffset= destoffset;
     return FALSE;
 }
 
@@ -4184,11 +4194,13 @@
 
 #if MYSQL_VERSION_ID >= SERVER_PREPARE_VERSION
   STRLEN slen;
-  char *buffer;
+  char *buffer= NULL;
   int buffer_is_null= 0;
   int buffer_length= slen;
-  int buffer_type= 0;
-#endif
+  unsigned int buffer_type= 0;
+#endif
+  attribs= attribs;
+  maxlen= maxlen;
 
   if (param_num <= 0  ||  param_num > DBIc_NUM_PARAMS(imp_sth))
   {
@@ -4444,6 +4456,9 @@
     "mysql_is_num"
   };
 
+  dbh= dbh;
+  imp_dbh= imp_dbh;
+ 
   hv= newHV();
   av_push(av, newRV_noinc((SV*) hv));
   for (i= 0;  i < (int)(sizeof(cols) / sizeof(const char*));  i++)
@@ -4556,6 +4571,14 @@
 SV *mysql_db_last_insert_id(SV *dbh, imp_dbh_t *imp_dbh,
         SV *catalog, SV *schema, SV *table, SV *field, SV *attr)
 {
+  /* all these non-op settings are to stifle OS X compile warnings */
+  imp_dbh= imp_dbh;
+  dbh= dbh;
+  catalog= catalog;
+  schema= schema;
+  table= table;
+  field= field;
+  attr= attr;
   return sv_2mortal(my_ulonglong2str(mysql_insert_id(&((imp_dbh_t*)imp_dbh)->mysql)));
 }
 #endif
@@ -4613,7 +4636,7 @@
 
     *end= cp;
 
-    if (cp - string < len) {
+    if (cp - string < (int) len) {
         return -1;
     }
 

Modified: trunk/libdbd-mysql-perl/dbdimp.h
URL: http://svn.debian.org/wsvn/trunk/libdbd-mysql-perl/dbdimp.h?rev=11804&op=diff
==============================================================================
--- trunk/libdbd-mysql-perl/dbdimp.h (original)
+++ trunk/libdbd-mysql-perl/dbdimp.h Fri Dec 28 18:38:37 2007
@@ -12,7 +12,7 @@
  *  You may distribute this under the terms of either the GNU General Public
  *  License or the Artistic License, as specified in the Perl README file.
  *
- *  $Id: dbdimp.h 9626 2007-06-01 02:44:03Z capttofu $
+ *  $Id: dbdimp.h 10412 2007-12-11 21:42:15Z capttofu $
  */
 
 /*
@@ -21,6 +21,7 @@
 #include <DBIXS.h>  /* installed by the DBI module                        */
 #include <mysql.h>  /* Comes with MySQL-devel */
 #include <mysqld_error.h>  /* Comes MySQL */
+
 #include <errmsg.h> /* Comes with MySQL-devel */
 
 /*

Modified: trunk/libdbd-mysql-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libdbd-mysql-perl/debian/changelog?rev=11804&op=diff
==============================================================================
--- trunk/libdbd-mysql-perl/debian/changelog (original)
+++ trunk/libdbd-mysql-perl/debian/changelog Fri Dec 28 18:38:37 2007
@@ -1,4 +1,4 @@
-libdbd-mysql-perl (4.005-2) UNRELEASED; urgency=low
+libdbd-mysql-perl (4.006-1) UNRELEASED; urgency=low
 
   [ Raphael Hertzog ]
   * Move myself to Uploaders and put the team as Maintainer.
@@ -7,6 +7,7 @@
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
     field (source stanza); Homepage field (source stanza). Removed: XS-
     Vcs-Svn fields.
+  * New upstream release.
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 09 Oct 2007 22:28:48 +0200
 

Modified: trunk/libdbd-mysql-perl/lib/DBD/mysql.pm
URL: http://svn.debian.org/wsvn/trunk/libdbd-mysql-perl/lib/DBD/mysql.pm?rev=11804&op=diff
==============================================================================
--- trunk/libdbd-mysql-perl/lib/DBD/mysql.pm (original)
+++ trunk/libdbd-mysql-perl/lib/DBD/mysql.pm Fri Dec 28 18:38:37 2007
@@ -9,7 +9,7 @@
 use Carp ();
 @ISA = qw(DynaLoader);
 
-$VERSION = '4.005';
+$VERSION = '4.006';
 
 bootstrap DBD::mysql $VERSION;
 

Modified: trunk/libdbd-mysql-perl/t/40bindparam2.t
URL: http://svn.debian.org/wsvn/trunk/libdbd-mysql-perl/t/40bindparam2.t?rev=11804&op=diff
==============================================================================
--- trunk/libdbd-mysql-perl/t/40bindparam2.t (original)
+++ trunk/libdbd-mysql-perl/t/40bindparam2.t Fri Dec 28 18:38:37 2007
@@ -71,8 +71,6 @@
   Test($state or ($dbh->do("INSERT INTO t1 VALUES(NULL, 1)")))
     or DbiError($dbh->err, $dbh->errstr);
 
-  #Test($state or !($dbh->trace("3", "/tmp/bindparam2.log")));
-
   Test($state or ($rows= $dbh->selectall_arrayref("SELECT * FROM t1")))
     or DbiError($dbh->err, $dbh->errstr);
 

Modified: trunk/libdbd-mysql-perl/t/41bindparam.t
URL: http://svn.debian.org/wsvn/trunk/libdbd-mysql-perl/t/41bindparam.t?rev=11804&op=diff
==============================================================================
--- trunk/libdbd-mysql-perl/t/41bindparam.t (original)
+++ trunk/libdbd-mysql-perl/t/41bindparam.t Fri Dec 28 18:38:37 2007
@@ -38,9 +38,6 @@
     DBI->connect($test_dsn, $test_user, $test_password,
   { RaiseError => 1, AutoCommit => 1})) or ServerError() ;
 
-  Test($state or (!$dbh->trace("3", "/tmp/trace.log"))) or
-   DbiError($dbh->err, $dbh->errstr);
-
   $table= 't1'; 
   Test($state or $dbh->do("drop table if exists $table")) or
     DbiError($dbh->err, $dbh->errstr); 

Modified: trunk/libdbd-mysql-perl/t/42bindparam.t
URL: http://svn.debian.org/wsvn/trunk/libdbd-mysql-perl/t/42bindparam.t?rev=11804&op=diff
==============================================================================
--- trunk/libdbd-mysql-perl/t/42bindparam.t (original)
+++ trunk/libdbd-mysql-perl/t/42bindparam.t Fri Dec 28 18:38:37 2007
@@ -37,9 +37,6 @@
   Test($state or $dbh =
     DBI->connect($test_dsn, $test_user, $test_password,
   { RaiseError => 1, AutoCommit => 1})) or ServerError() ;
-
-  #Test($state or (!$dbh->trace("3", "/tmp/trace.log"))) or
-  # DbiError($dbh->err, $dbh->errstr);
 
   $table= 't1'; 
 

Modified: trunk/libdbd-mysql-perl/t/texecute.t
URL: http://svn.debian.org/wsvn/trunk/libdbd-mysql-perl/t/texecute.t?rev=11804&op=diff
==============================================================================
--- trunk/libdbd-mysql-perl/t/texecute.t (original)
+++ trunk/libdbd-mysql-perl/t/texecute.t Fri Dec 28 18:38:37 2007
@@ -18,8 +18,6 @@
        ($dbh = DBI->connect($test_dsn, $test_user, $test_password,
                            {RaiseError => 0})));
 
-  #Test($state or ($dbh->trace("3", "/tmp/trace.log")));
-  #
   # Find a possible new table name
   #
   my $table = 't1';

More information about the Pkg-perl-cvs-commits mailing list