From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Wed, 19 Nov 2003 18:23:17 +0300 From: Alexey Tourbin To: devel@altlinux.ru Message-ID: <20031119152317.GR1860@julia.office.altlinux.ru> Mail-Followup-To: devel@altlinux.ru, sisyphus@altlinux.ru Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="0M7E0x35R+W+EAky" Content-Disposition: inline Cc: sisyphus@altlinux.ru Subject: [devel] sisyphus-daily? X-BeenThere: devel@altlinux.ru X-Mailman-Version: 2.1.3 Precedence: list Reply-To: ALT Devel discussion list List-Id: ALT Devel discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2003 15:23:18 -0000 Archived-At: List-Archive: List-Post: --0M7E0x35R+W+EAky Content-Type: multipart/mixed; boundary="8N5nZmKALFZnI1Hj" Content-Disposition: inline Content-Transfer-Encoding: 8bit --8N5nZmKALFZnI1Hj Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: 8bit Господа, Нет ли у нас желания иметь рассылку типа mandarke-changelog? В отличие от последней, мне (например) было бы интересно просматривать полный список изменений в пакетах, включая дерево исходников. Думаю, что это можно устроить. Пример прилагаю. --8N5nZmKALFZnI1Hj Content-Type: text/plain; charset=koi8-r Content-Disposition: attachment; filename=perl-DBD-mysql-changelog Content-Transfer-Encoding: 8bit --- perl-DBD-mysql-2.90.02-alt1/perl-DBD-mysql.spec 2003-07-05 20:20:59 +0400 +++ perl-DBD-mysql-2.90.03-alt1/perl-DBD-mysql.spec 2003-10-28 17:55:09 +0300 @@ -1,36 +1,35 @@ -%define module DBD-mysql -Name: perl-%module -Version: 2.90.02 +%define dist DBD-mysql +Name: perl-%dist +Version: 2.90.03 +%define real_ver 2.9003 Release: alt1 -%define real_ver %(echo %version | sed -e 's/\\(.*\\)\\./\\1/') - Summary: MySQL driver for DBI interface in Perl -Summary(ru_RU.CP1251): Поддержка MySQL в Perl через абстрактный интерфейс DBI Group: Development/Perl License: GPL or Artistic Url: http://search.cpan.org/dist/DBD-mysql/ -Source: %module-%real_ver.tar.bz2 +Source: %dist-%real_ver.tar.bz2 -Obsoletes: perl-Mysql +# Automatically added by buildreq on Tue Oct 28 2003 +BuildRequires: libMySQL-devel perl-DBI perl-devel zlib-devel -# Automatically added by buildreq on Sat Jul 05 2003 -BuildRequires: glibc-kernheaders libMySQL-devel perl-DBI perl-devel zlib-devel +Summary(ru_RU.CP1251): Поддержка MySQL в Perl через абстрактный интерфейс DBI %description DBD::mysql is an interface driver for connecting the DBMS independent Perl-API DBI to the mysql DBMS. %description -l ru_RU.CP1251 -DBD::mysql -- это драйвер для доступа к MySQL из программ на Perl, использующих -для работы с базами данных абстрактный интерфейс DBI. +DBD::mysql -- это драйвер для доступа к MySQL из программ на Perl, +использующих для работы с базами данных абстрактный интерфейс DBI. %prep -%setup -q -n %module-%real_ver +%setup -q -n %dist-%real_ver %build %def_without test +export SLOW_TESTS=1 %perl_vendor_build %install @@ -45,6 +44,13 @@ %doc README ChangeLog %changelog +* Tue Oct 28 2003 Alexey Tourbin 2.90.03-alt1 +- 2.9003 + +* Fri Oct 03 2003 Alexey Tourbin 2.90.03-alt0.1 +- 2.9003_1 +- build against libmysqlclient.so.12 + * Sat Jul 05 2003 Alexey Tourbin 2.90.02-alt1 - 2.9002 (some changes are significant) removed `/home/at/tmp/perl-DBD-mysql-2.90.02-alt1.src.rpm.vJqYj12590/perl-DBD-mysql.spec' removed `/home/at/tmp/perl-DBD-mysql-2.90.03-alt1.src.rpm.rmIvw12591/perl-DBD-mysql.spec' diff -urp perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/ChangeLog perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/ChangeLog --- perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/ChangeLog 2003-06-24 09:39:12 +0400 +++ perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/ChangeLog 2003-10-27 06:25:36 +0300 @@ -1,3 +1,32 @@ +2003-10-26 Rudy Lippan (2.9003) + * Applied patch from Aaron and Chuck that added basic testing of the + table_info/column_info functions [Aaron Ross ] + * Applied patch removing Jochen Wiedmann's contanct information and + also removing the restriction on CD ROM distribution. + [Jochen Wiedmen ] + * The check for the innodb table type was broken so the transaction + tests were skipped even though the database supported transactions. + * :sql_types were not being inported in column info, so SQL_VARCAR was + thowing an error. Also, the :sql_types were not being pulled into + DBD::mysq::db package + * Patch for dbdadmin.t so that it respects username and password + [Alexey Stroganov ] + * Fix for memory leak in bind_param() introduced in 2.9002 + (2.9002 changed bind_param so that changing the value of a scalar + after binding would not affect what was passed to execute eg: + $sth->bind_param(1,$foo); + $foo = 'bar' + $sth->execute() -- $foo would contain 'bar') + [reported by ] + * don't define dbd_discon_all so that mysql uses DBI's This fixes a + bug whereby DBD::mysql was dropping perl's destruct level. + * patch to myld so that it uses strict and fixes scoping problem + with $contents [Jochen Wiedmann ] + * Modified Makefile.PL so that it gives a usage message + if any unknown options are passed in. + * patch to INSTALL.pod on how to link DBD::mysql against + a static libmysqlclient [Jochen Wiedmann ] + 2003-06-22 Rudy Lippan (2.9002) * moved pod into mysql.pm from mysql.pod * Changed the default behaviour of mysql_found_rows, so now @@ -29,8 +58,8 @@ **NOTE** this is a change in behaviour that MAY cause problems with some SQL statements. If quoted integers, for example, - cause any problems, use bind_param(, SQL_INTEGER) to - force a column to be bound as an integer. + cause any problems, use bind_param(, undef, SQL_INTEGER) + to force a column to be bound as an integer. * Added get_info() method. See 'perldoc DBI' for more info * Added column_info(). See 'perldoc DBI' for more info [Tim Bunce] @@ -718,7 +747,7 @@ Fri Oct 24 01:29:08 1997 Jochen Wiedman * lib/Msql/Statement.pm: Fixed use of Msql::TEXT_TYPE without checking whether we are running Msql 1. -$Id: ChangeLog,v 1.11 2003/06/24 05:39:12 rlippan Exp $ +$Id: ChangeLog,v 1.14 2003/10/27 03:25:36 rlippan Exp $ DBD::mysql for DBI - Written by Jochen Wiedmann diff -urp perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/dbdimp.c perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/dbdimp.c --- perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/dbdimp.c 2003-06-24 09:37:25 +0400 +++ perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/dbdimp.c 2003-10-17 21:20:50 +0400 @@ -1,23 +1,13 @@ /* * DBD::mysql - DBI driver for the mysql database * - * Copyright (c) 1997, 1998 Jochen Wiedmann + * Copyright (c) 2003 Rudolf Lippan + * Copyright (c) 1997-2003 Jochen Wiedmann * * 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, - * with the exception that it cannot be placed on a CD-ROM or similar media - * for commercial distribution without the prior approval of the author. + * License or the Artistic License, as specified in the Perl README file. * - * Author: Jochen Wiedmann - * Am Eisteich 9 - * 72555 Metzingen - * Germany - * - * Email: joe@ispsoft.de - * Fax: +49 7123 / 14892 - * - * - * $Id: dbdimp.c,v 1.9 2003/06/24 05:37:25 rlippan Exp $ + * $Id: dbdimp.c,v 1.11 2003/10/17 17:20:50 rlippan Exp $ */ @@ -292,7 +282,6 @@ int BindParam(imp_sth_ph_t* ph, SV* valu (void) SvREFCNT_dec(ph->value); } ph->value = newSVsv(value); - (void) SvREFCNT_inc(value); if (sql_type) { ph->type = sql_type; } diff -urp perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/dbdimp.h perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/dbdimp.h --- perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/dbdimp.h 2003-06-24 09:50:01 +0400 +++ perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/dbdimp.h 2003-10-17 21:20:50 +0400 @@ -1,27 +1,17 @@ /* * DBD::mSQL - DBI driver for the mysql database * - * Copyright (c) 1997 Jochen Wiedmann + * Copyright (c) 2003 Rudolf Lippan + * Copyright (c) 1997-2003 Jochen Wiedmann * * Based on DBD::Oracle; DBD::Oracle is * * Copyright (c) 1994,1995 Tim Bunce * * 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, - * with the exception that it cannot be placed on a CD-ROM or similar media - * for commercial distribution without the prior approval of the author. + * License or the Artistic License, as specified in the Perl README file. * - * Author: Jochen Wiedmann - * Am Eisteich 9 - * 72555 Metzingen - * Germany - * - * Email: joe@ispsoft.de - * Fax: +49 7123 / 14892 - * - * - * $Id: dbdimp.h,v 1.3 2003/06/24 05:50:01 rlippan Exp $ + * $Id: dbdimp.h,v 1.5 2003/10/17 17:20:50 rlippan Exp $ */ /* @@ -179,7 +169,6 @@ struct imp_sth_st { #define dbd_db_commit mysql_db_commit #define dbd_db_rollback mysql_db_rollback #define dbd_db_disconnect mysql_db_disconnect -#define dbd_discon_all mysql_db_discon_all #define dbd_db_destroy mysql_db_destroy #define dbd_db_STORE_attrib mysql_db_STORE_attrib #define dbd_db_FETCH_attrib mysql_db_FETCH_attrib diff -urp perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/INSTALL.html perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/INSTALL.html --- perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/INSTALL.html 2003-06-24 09:52:23 +0400 +++ perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/INSTALL.html 2003-10-27 06:33:28 +0300 @@ -392,12 +392,18 @@ library. This can be done by adding the 
   -L/usr/lib/mysql -lmysqlclient
   -LC:\mysql\lib -lmysqlclient
-
-  /usr/lib/mysql/libmysqlclient.a
-  C:\mysql\lib\mysqlclient.lib
-

The latter examples are using a statically linked library. This -may be required in some cases, if the dynamically linked library -is not found at run time.

+

If you would like to use the static libraries (and there are +excellent reasons to do so), you need to create a separate +directory, copy the static libraries to that place and use +the -L switch above to point to your new directory. For example:

+
+  mkdir /tmp/mysql-static
+  cp /usr/lib/mysql/*.a /tmp/mysql-static
+  perl Makefile.PL --libs="-L/tmp/mysql-static -lmysqlclient"
+  make
+  make test
+  make install
+  rm -rf /tmp/mysql-static

The gzip library
@@ -648,13 +654,9 @@ problem is that this file is located in library, for example

   /usr/lib/mysql/libmysqlclient.a
-

You force linking against this file by replacing

-
-  -L/usr/lib/mysql -lmysqlclient
-

with

-
-  /usr/lib/mysql/libmysqlclient.a
-

in the list of linker flags. Configuration. Linker flags.

+

The use of a statically linked library is described in the +previous section on linker flags. Configuration. +Linker flags.

  • )
    diff -urp perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/lib/DBD/mysql/INSTALL.pod perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/lib/DBD/mysql/INSTALL.pod --- perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/lib/DBD/mysql/INSTALL.pod 2003-06-10 04:16:42 +0400 +++ perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/lib/DBD/mysql/INSTALL.pod 2003-07-17 07:00:13 +0400 @@ -414,12 +414,19 @@ or by adding the complete path name. Exa -L/usr/lib/mysql -lmysqlclient -LC:\mysql\lib -lmysqlclient - /usr/lib/mysql/libmysqlclient.a - C:\mysql\lib\mysqlclient.lib +If you would like to use the static libraries (and there are +excellent reasons to do so), you need to create a separate +directory, copy the static libraries to that place and use +the -L switch above to point to your new directory. For example: + + mkdir /tmp/mysql-static + cp /usr/lib/mysql/*.a /tmp/mysql-static + perl Makefile.PL --libs="-L/tmp/mysql-static -lmysqlclient" + make + make test + make install + rm -rf /tmp/mysql-static -The latter examples are using a statically linked library. This -may be required in some cases, if the dynamically linked library -is not found at run time. =item The gzip library @@ -720,15 +727,9 @@ library, for example /usr/lib/mysql/libmysqlclient.a -You force linking against this file by replacing - - -L/usr/lib/mysql -lmysqlclient - -with - - /usr/lib/mysql/libmysqlclient.a - -in the list of linker flags. L. L. +The use of a statically linked library is described in the +previous section on linker flags. L. +L. =item 4.) diff -urp perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/lib/DBD/mysql.pm perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/lib/DBD/mysql.pm --- perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/lib/DBD/mysql.pm 2003-06-24 04:25:19 +0400 +++ perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/lib/DBD/mysql.pm 2003-10-27 06:26:08 +0300 @@ -9,7 +9,7 @@ use DynaLoader(); use Carp (); @ISA = qw(DynaLoader); -$VERSION = '2.9002'; +$VERSION = '2.9003'; bootstrap DBD::mysql $VERSION; @@ -29,7 +29,7 @@ sub driver{ 'Version' => $VERSION, 'Err' => \$DBD::mysql::err, 'Errstr' => \$DBD::mysql::errstr, - 'Attribution' => 'DBD::mysql by Jochen Wiedmann' + 'Attribution' => 'DBD::mysql by Rudy Lippan' }); $drh; @@ -97,6 +97,7 @@ sub AUTOLOAD { package DBD::mysql::dr; # ====== DRIVER ====== use strict; +use DBI qw(:sql_types); sub connect { my($drh, $dsn, $username, $password, $attrhash) = @_; @@ -108,8 +109,8 @@ sub connect { $password ||= ''; # create a 'blank' dbh - my($this, $privateAttrHash); - $privateAttrHash = { + my($this, $privateAttrHash) = (undef, $attrhash); + $privateAttrHash = { %$privateAttrHash, 'Name' => $dsn, 'user' => $username, 'password' => $password @@ -137,12 +138,14 @@ sub connect { sub data_sources { my($self) = shift; my($attributes) = shift; - my($host, $port) = ('', ''); + my($host, $port, $user, $password) = ('', '', '', ''); if ($attributes) { $host = $attributes->{host} || ''; $port = $attributes->{port} || ''; + $user = $attributes->{user} || ''; + $password = $attributes->{password} || ''; } - my(@dsn) = $self->func($host, $port, '_ListDBs'); + my(@dsn) = $self->func($host, $port, $user, $password, '_ListDBs'); my($i); for ($i = 0; $i < @dsn; $i++) { $dsn[$i] = "DBI:mysql:$dsn[$i]"; @@ -168,6 +171,7 @@ sub admin { package DBD::mysql::db; # ====== DATABASE ====== use strict; +use DBI qw(:sql_types); %DBD::mysql::db::db2ANSI = ("INT" => "INTEGER", "CHAR" => "CHAR", @@ -1675,8 +1679,9 @@ in the PPM program. =head1 AUTHORS The current version of B is almost completely written -by Jochen Wiedmann (I). The first version's author -was Alligator Descartes(I), who has been +by Jochen Wiedmann, and is now being maintained by +Rudy Lippan (I). The first version's author +was Alligator Descartes (I), who has been aided and abetted by Gary Shea, Andreas Kцnig and Tim Bunce amongst others. @@ -1687,8 +1692,10 @@ layer, is from Jochen Wiedmann. =head1 COPYRIGHT -This module is Copyright (c) 1997-2001 Jochen Wiedmann, with code -portions Copyright (c)1994-1997 their original authors. This module is + +This module is Copyright (c) 2003 Rudolf Lippan; Large Portions +Copyright (c) 1997-2003 Jochen Wiedmann, with code portions +Copyright (c)1994-1997 their original authors This module is released under the same license as Perl itself. See the Perl README for details. @@ -1697,15 +1704,15 @@ for details. This module is maintained and supported on a mailing list, - msql-mysql-modules@lists.mysql.com + perl@lists.mysql.com To subscribe to this list, send a mail to - msql-mysql-modules-subscribe@lists.mysql.com + perl-subscribe@lists.mysql.com or - msql-mysql-modules-digest-subscribe@lists.mysql.com + perl-digest-subscribe@lists.mysql.com Mailing list archives are available at diff -urp perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/lib/Mysql.pm perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/lib/Mysql.pm --- perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/lib/Mysql.pm 2003-05-28 06:26:52 +0400 +++ perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/lib/Mysql.pm 2003-10-17 21:20:50 +0400 @@ -823,8 +823,7 @@ or =head1 AUTHORS Andreas Koenig C wrote the original -MsqlPerl. Jochen Wiedmann C wrote the M(y)sqlPerl -emulation using DBI. +MsqlPerl. Jochen Wiedmann wrote the M(y)sqlPerl emulation using DBI. =head1 SEE ALSO diff -urp perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/Makefile.PL perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/Makefile.PL --- perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/Makefile.PL 2003-06-10 03:50:13 +0400 +++ perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/Makefile.PL 2003-10-17 21:20:50 +0400 @@ -19,7 +19,7 @@ Getopt::Long::GetOptions($opt, "help", " "testuser=s", "testpassword=s", "cflags=s", "libs=s", "verbose", "nocatchstderr", - "ssl!","nofoundrows!"); + "ssl!","nofoundrows!") || die Usage(); my $source = {}; foreach my $key (qw/testdb testhost testuser testpassword cflags libs @@ -90,7 +90,7 @@ if ($ExtUtils::MakeMaker::VERSION >= 5.4 $o{'CAPI'} = 'TRUE' if ($ExtUtils::MakeMaker::VERSION >= 5.43 && $Config::Config{'archname'} =~ /-object\b/i); - $o{'AUTHOR'} = 'Jochen Wiedmann '; + $o{'AUTHOR'} = 'Rudy Lippan '; $o{'ABSTRACT'} = 'A MySQL driver for the Perl5 Database Interface (DBI)'; $o{'PREREQ_PM'} = { 'DBI' => 1.08, diff -urp perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/myld perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/myld --- perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/myld 2003-03-18 05:53:27 +0300 +++ perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/myld 2003-08-07 20:44:58 +0400 @@ -4,16 +4,19 @@ # in the linking stage # +use strict; + open(OLDSTDERR, ">&STDERR") || die "Failed to backup STDERR: $!"; open(FILE, ">myld.stderr") || die "Failed to create myld.stderr: $!"; open(STDERR, ">&FILE") || die "Failed to redirect STDERR: $!"; -$retval = system @ARGV; +my $retval = system @ARGV; open(STDERR, ">&OLDSTDERR"); close(FILE) || die "Failed to close myld.stderr: $!"; +my $contents = ""; if (-f "myld.stderr" && !-z _) { open(FILE, "; + $contents = ; die "Failed to read myld.stderr: $!" unless defined($contents); close(FILE) || die "Failed to close myld.stderr: $!"; @@ -23,8 +26,8 @@ if (-f "myld.stderr" && !-z _) { $contents An error occurred while linking the DBD::mysql driver. The error -message seems to indicate that you don't have a libz.a, libgz.a, -libz.so or libgz.so. This is typically resolved by: +message seems to indicate that you don't have a lib$missing.a, +or a lib$missing.so. This is typically resolved by: 1.) You may try to remove the -lz or -lgz flag from the libs list by using the --libs switch for "perl Makefile.PL". diff -urp perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/mysql.xs perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/mysql.xs --- perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/mysql.xs 2003-04-01 05:17:27 +0400 +++ perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/mysql.xs 2003-10-17 21:20:50 +0400 @@ -1,13 +1,12 @@ /* Hej, Emacs, this is -*- C -*- mode! - $Id: mysql.xs,v 1.2 2003/04/01 01:17:27 rlippan Exp $ + $Id: mysql.xs,v 1.3 2003/10/17 17:20:50 rlippan Exp $ - Copyright (c) 1997, 1998 Jochen Wiedmann + Copyright (c) 2003 Rudolf Lippan + Copyright (c) 1997-2003 Jochen Wiedmann You may distribute under the terms of either the GNU General Public - License or the Artistic License, as specified in the Perl README file, - with the exception that it cannot be placed on a CD-ROM or similar media - for commercial distribution without the prior approval of the author. + License or the Artistic License, as specified in the Perl README file. */ diff -urp perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/t/40listfields.t perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/t/40listfields.t --- perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/t/40listfields.t 2003-05-28 05:58:51 +0400 +++ perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/t/40listfields.t 2003-10-22 22:29:35 +0400 @@ -1,6 +1,6 @@ #!/usr/local/bin/perl # -# $Id: 40listfields.t,v 1.1 2003/03/18 02:53:28 rlippan Exp $ +# $Id: 40listfields.t,v 1.2 2003/10/22 18:29:35 rlippan Exp $ # # This is a test for statement attributes being present appropriately. # @@ -70,6 +70,8 @@ while (Testing()) { $dbh->do($def))) or DbiError($dbh->err, $dbh->errstr); + Test($state or $dbh->table_info(undef,undef,$table)); + Test($state or $dbh->column_info(undef,undef,$table,'%')); Test($state or $cursor = $dbh->prepare("SELECT * FROM $table")) or DbiError($dbh->err, $dbh->errstr); diff -urp perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/t/50commit.t perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/t/50commit.t --- perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/t/50commit.t 2003-03-18 05:53:28 +0300 +++ perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/t/50commit.t 2003-08-29 00:31:13 +0400 @@ -1,6 +1,6 @@ #!/usr/local/bin/perl # -# $Id: 50commit.t,v 1.1 2003/03/18 02:53:28 rlippan Exp $ +# $Id: 50commit.t,v 1.2 2003/08/28 20:31:13 rlippan Exp $ # # This is testing the transaction support. # @@ -161,7 +161,7 @@ while (Testing()) { or ErrMsg("Expected fatal error for AutoCommit => 0\n"); for (my $i = 0; $i < 14; $i++) { - Skip("No transactions"); + Skip("Unable to detect a transactional table type; Skipping transaction tests"); } } diff -urp perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/t/60leaks.t perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/t/60leaks.t --- perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/t/60leaks.t 2003-03-18 05:53:28 +0300 +++ perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/t/60leaks.t 2003-09-12 19:50:32 +0400 @@ -1,6 +1,6 @@ #!/usr/local/bin/perl # -# $Id: 60leaks.t,v 1.1 2003/03/18 02:53:28 rlippan Exp $ +# $Id: 60leaks.t,v 1.2 2003/09/12 15:50:32 rlippan Exp $ # # This is a skeleton test. For writing new tests, take this file # and modify/extend it. @@ -11,10 +11,9 @@ my $COUNT_PREPARE = 10000; # Number of my $haveStorable; - eval { require Proc::ProcessTable; }; if ($@ || !$ENV{SLOW_TESTS}) { - print "1..0 # \$ENV{SLOW_TESTS} is not set\n"; + print "1..0 # Skip \$ENV{SLOW_TESTS} is not set or Proc::ProcessTable not installed \n"; exit 0; } eval { require Storable }; diff -urp perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/t/dbdadmin.t perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/t/dbdadmin.t --- perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/t/dbdadmin.t 2003-03-18 05:53:28 +0300 +++ perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/t/dbdadmin.t 2003-09-12 19:56:21 +0400 @@ -76,7 +76,7 @@ while (Testing()) { or ServerError(); Test($state or (@dsn = DBI->data_sources( - $mdriver, {host => $test_host, port => $test_port})) >= 0); + $mdriver, {host => $test_host, port => $test_port, user=> $test_user, password=>$test_password})) >= 0); Test($state or (@dsn = DBI->data_sources($mdriver)) >= 0); if (!$state && $verbose) { my $d; @@ -136,7 +136,9 @@ while (Testing()) { or InDsnList($testdsn, DBI->data_sources($mdriver)) or InDsnList($testdsn, DBI->data_sources($mdriver, {"host" => $test_host, - "port" => $test_port}))) + "port" => $test_port, + "user" => $test_user, + "password" => $test_password}))) or print STDERR ("New DB not in DSN list\n"); Test($state or $accessDenied @@ -150,7 +152,9 @@ while (Testing()) { !InDsnList($testdsn, DBI->data_sources($mdriver, {"host" => $test_host, - "port" => $test_port})))) + "port" => $test_port, + "user" => $test_user, + "password" => $test_password})))) or print STDERR ("New DB not removed from DSN list\n"); my($mayShutdown) = $ENV{'DB_SHUTDOWN_ALLOWED'}; @@ -165,7 +169,9 @@ while (Testing()) { or InDsnList($testdsn1, DBI->data_sources($mdriver, {"host" => $test_host, - "port" => $test_port}))) + "port" => $test_port, + "user" => $test_user, + "password" => $test_password}))) or printf STDERR ("DSN $testdsn1 not in DSN list.\n"); Test($state or $accessDenied or $drh->func('dropdb', $testdsn1, $test_host, @@ -177,7 +183,9 @@ while (Testing()) { !InDsnList($testdsn1, DBI->data_sources($mdriver, {"host" => $test_host, - "port" => $test_port})))) + "port" => $test_port, + "user" => $test_user, + "password" => $test_password})))) or printf STDERR ("DSN $testdsn1 not removed from DSN list.\n"); Test($state or $accessDenied or $drh->func('createdb', $testdsn2, $test_host, @@ -189,7 +197,9 @@ while (Testing()) { or InDsnList($testdsn2, DBI->data_sources($mdriver, {"host" => $test_host, - "port" => $test_port}))) + "port" => $test_port, + "user" => $test_user, + "password" => $test_password}))) or printf STDERR ("DSN $testdsn2 not in DSN list.\n"); Test($state or $accessDenied or $drh->func('dropdb', $testdsn2, $test_host, @@ -201,7 +211,9 @@ while (Testing()) { !InDsnList($testdsn2, DBI->data_sources($mdriver, {"host" => $test_host, - "port" => $test_port})))) + "port" => $test_port, + "user" => $test_user, + "password" => $test_password})))) or printf STDERR ("DSN $testdsn2 not removed from DSN list.\n"); if ($mdriver eq 'mysql') { diff -urp perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/t/lib.pl perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/t/lib.pl --- perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/t/lib.pl 2003-03-31 05:16:53 +0400 +++ perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/t/lib.pl 2003-08-29 00:34:33 +0400 @@ -1,6 +1,6 @@ # Hej, Emacs, give us -*- perl mode here! # -# $Id: lib.pl,v 1.2 2003/03/31 01:16:53 rlippan Exp $ +# $Id: lib.pl,v 1.3 2003/08/28 20:34:33 rlippan Exp $ # # lib.pl is the file where database specific things should live, # whereever possible. For example, you define certain constants @@ -25,9 +25,6 @@ $dbdriver = $mdriver; # $dbdriver is usu # # DSN being used; do not edit this, edit "$dbdriver.dbtest" instead # -$test_dsn = $ENV{'DBI_DSN'} || 'DBI:mysql:database=test'; -$test_user = $ENV{'DBI_USER'} || ''; -$test_password = $ENV{'DBI_PASS'} || ''; $::COL_NULLABLE = 1; @@ -45,6 +42,9 @@ if (-f ($file = "t/$dbdriver.dbtest") | print "1..0\n"; exit 0; } + $::test_dsn = $::test_dsn || $ENV{'DBI_DSN'} || 'DBI:mysql:database=test'; + $::test_user = $::test_user|| $ENV{'DBI_USER'} || ''; + $::test_password = $::test_passowrd || $ENV{'DBI_PASS'} || ''; } if (-f ($file = "t/$mdriver.mtest") || -f ($file = "$mdriver.mtest") || diff -urp perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/t/mysql.dbtest perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/t/mysql.dbtest --- perl-DBD-mysql-2.90.02-alt1/DBD-mysql-%version/t/mysql.dbtest 2003-03-18 05:53:28 +0300 +++ perl-DBD-mysql-2.90.03-alt1/DBD-mysql-%version/t/mysql.dbtest 2003-09-12 19:57:46 +0400 @@ -1,6 +1,6 @@ # Hej, Emacs, give us -*- perl -*- mode here! # -# $Id: mysql.dbtest,v 1.1 2003/03/18 02:53:28 rlippan Exp $ +# $Id: mysql.dbtest,v 1.2 2003/09/12 15:57:46 rlippan Exp $ # # database specific definitions for a 'mysql' database @@ -142,7 +142,7 @@ sub HaveTransactions () { $have_transactions = "bdb"; last; } - if ($row->{'Variable_name'} eq 'have_innobase' && + if ($row->{'Variable_name'} eq 'have_innodb' && $row->{'Value'} eq 'YES') { $have_transactions = "innobase"; last; --8N5nZmKALFZnI1Hj-- --0M7E0x35R+W+EAky Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.3 (GNU/Linux) iD8DBQE/u4rlfBKgtDjnu0YRAnUhAKDZ/BzuoE352GhnTsRaU0aPyzDB/QCfeChG /0mvbwxKATY/clcGJnp1o5g= =Xz/O -----END PGP SIGNATURE----- --0M7E0x35R+W+EAky--