apply tested patch from F-15 (is_prefix replaced by strncmp) #703185

- remove deffattr
This commit is contained in:
Marcela Mašláňová 2011-05-13 16:04:14 +02:00
parent 0f666f2b0d
commit 34910a5a08
2 changed files with 19 additions and 3 deletions

12
DBD-mysql-is_prefix.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up DBD-mysql-4.018/mysql.xs.isprefix DBD-mysql-4.018/mysql.xs
--- DBD-mysql-4.018/mysql.xs.isprefix 2010-07-09 19:47:47.000000000 +0200
+++ DBD-mysql-4.018/mysql.xs 2011-05-10 18:08:07.812894258 +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 = ((strncmp(mysql_get_server_info(imp_dbh->pmysql),"3.22",4) == 0) ? 1 : 0 );
retsv = newSVpv(!using_322 ? "`" : " ", 1);
break;
case SQL_MAXIMUM_STATEMENT_LENGTH:

View File

@ -1,13 +1,13 @@
Name: perl-DBD-MySQL
Version: 4.019
Release: 1%{?dist}
Release: 2%{?dist}
Summary: A MySQL interface for perl
Group: Development/Libraries
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
Patch0: DBD-mysql-is_prefix.patch
# Prevent bug #443495
BuildRequires: perl(DBI) >= 1.607
@ -25,6 +25,7 @@ An implementation of DBI for MySQL for Perl.
%prep
%setup -q -n DBD-mysql-%{version}
%patch0 -p1
# Correct file permissions
find . -type f | xargs chmod -x
@ -54,7 +55,6 @@ find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
%files
%defattr(-,root,root,-)
%doc ChangeLog INSTALL.html README TODO
%{perl_vendorarch}/Bundle/
%{perl_vendorarch}/DBD/
@ -63,6 +63,10 @@ find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
%changelog
* Fri May 13 2011 Marcela Mašláňová <mmaslano@redhat.com> - 4.019-2
- apply tested patch from F-15 (is_prefix replaced by strncmp) #703185
- remove deffattr
* Mon May 9 2011 Petr Sabata <psabata@redhat.com> - 4.019-1
- 4.019 bump
- Removing the clean section