From e5d74ab9460be98422c6eab9a8a41a24f692719b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 9 May 2011 17:33:54 +0200 Subject: perl-DBD-MySQL: workarond for https://bugzilla.redhat.com/703185 --- Makefile | 4 ++++ is_prefix.patch | 12 ++++++++++++ perl-DBD-MySQL.spec | 9 +++++++++ 3 files changed, 25 insertions(+) create mode 100644 Makefile create mode 100644 is_prefix.patch diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1e65467 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +SRCDIR := $(shell pwd) +NAME := $(shell basename $(SRCDIR)) +include ../common/Makefile + diff --git a/is_prefix.patch b/is_prefix.patch new file mode 100644 index 0000000..d573c6c --- /dev/null +++ b/is_prefix.patch @@ -0,0 +1,12 @@ +diff -up DBD-mysql-4.018/mysql.xs.orig DBD-mysql-4.018/mysql.xs +--- DBD-mysql-4.018/mysql.xs.orig 2011-05-09 17:22:51.607043049 +0200 ++++ DBD-mysql-4.018/mysql.xs 2011-05-09 17:23:19.895077638 +0200 +@@ -721,7 +721,7 @@ dbd_mysql_get_info(dbh, sql_info_type) + case SQL_IDENTIFIER_QUOTE_CHAR: + /*XXX What about a DB started in ANSI mode? */ + /* Swiped from MyODBC's get_info.c */ +- using_322=is_prefix(mysql_get_server_info(imp_dbh->pmysql),"3.22"); ++ using_322=0; + retsv = newSVpv(!using_322 ? "`" : " ", 1); + break; + case SQL_MAXIMUM_STATEMENT_LENGTH: diff --git a/perl-DBD-MySQL.spec b/perl-DBD-MySQL.spec index 232dc04..4e15e73 100644 --- a/perl-DBD-MySQL.spec +++ b/perl-DBD-MySQL.spec @@ -8,6 +8,9 @@ License: GPL+ or Artistic URL: http://search.cpan.org/dist/DBD-mysql/ Source0: http://www.cpan.org/authors/id/C/CA/CAPTTOFU/DBD-mysql-%{version}.tar.gz +# https://bugzilla.redhat.com/703185 +Patch0: is_prefix.patch + # Prevent bug #443495 BuildRequires: perl(DBI) >= 1.607 @@ -24,6 +27,9 @@ An implementation of DBI for MySQL for Perl. %prep %setup -q -n DBD-mysql-%{version} + +%patch0 -p1 -b .prefix + # Correct file permissions find . -type f | xargs chmod -x @@ -66,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 09 2011 Remi Collet - 4.018-5 +- workaround for https://bugzilla.redhat.com/703185 + * Tue Mar 22 2011 Marcela Mašláňová - 4.018-5 - rebuilt for libmysqlclient -- cgit