summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjustdave%syndicomm.com <>2001-06-07 06:10:47 +0200
committerjustdave%syndicomm.com <>2001-06-07 06:10:47 +0200
commite1417d77ee61c777ae414590c220fca0d8da3dca (patch)
treebdf062533ef6062cd0d0545cdfacafd08e83e0c9
parentce9c76ebbd1a699ce89cdead5f7ba427b62d9844 (diff)
downloadbugzilla-e1417d77ee61c777ae414590c220fca0d8da3dca.tar.gz
bugzilla-e1417d77ee61c777ae414590c220fca0d8da3dca.tar.xz
Fix for bug 83872: Bugzilla no longer requires the Mysql Perl module, but the DBD::mysql Perl module, and has been this way for a while. Fixing the version checks in checksetup.pl to check the correct module. Also eliminates a DBD::mysql-specific database function call that is depricated in the current version of DBD_mysql.
Patch by Dave Miller <justdave@syndicomm.com> r= jake@acutex.net, tara@tequilarista.org
-rwxr-xr-xchecksetup.pl14
1 files changed, 6 insertions, 8 deletions
diff --git a/checksetup.pl b/checksetup.pl
index 1edef559e..672371fa6 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -188,10 +188,10 @@ sub have_vers {
# Check versions of dependencies. 0 for version = any version acceptible
my @missing = ();
-unless (have_vers("DBI","1.13")) { push @missing,"DBI" }
-unless (have_vers("Data::Dumper",0)) { push @missing,"Data::Dumper" }
-unless (have_vers("Mysql",0)) { push @missing,"Mysql" }
-unless (have_vers("Date::Parse",0)) { push @missing,"Data::Parse" }
+unless (have_vers("DBI","1.13")) { push @missing,"DBI" }
+unless (have_vers("Data::Dumper",0)) { push @missing,"Data::Dumper" }
+unless (have_vers("DBD::mysql","1.2209")) { push @missing,"DBD::mysql" }
+unless (have_vers("Date::Parse",0)) { push @missing,"Date::Parse" }
# If CGI::Carp was loaded successfully for version checking, it changes the
# die and warn handlers, we don't want them changed, so we need to stash the
@@ -942,10 +942,8 @@ $table{duplicates} =
# Create tables
###########################################################################
-# The current DBI::mysql tells me to use this:
-#my @tables = map { $_ =~ s/.*\.//; $_ } $dbh->tables();
-# but that doesn't work on a freshly created database, so I still use
-my @tables = $dbh->func('_ListTables');
+# Get a list of the existing tables (if any) in the database
+my @tables = map { $_ =~ s/.*\.//; $_ } $dbh->tables;
#print 'Tables: ', join " ", @tables, "\n";
# add lines here if you add more --LOCAL-- config vars that end up in the enums: