diff options
| -rw-r--r-- | Bugzilla/DB/Mysql.pm | 5 | ||||
| -rw-r--r-- | Bugzilla/Install/Requirements.pm | 20 | ||||
| -rw-r--r-- | docs/en/xml/installation.xml | 27 | ||||
| -rw-r--r-- | docs/en/xml/modules.xml | 6 | ||||
| -rw-r--r-- | template/en/default/setup/strings.txt.pl | 18 |
5 files changed, 4 insertions, 72 deletions
diff --git a/Bugzilla/DB/Mysql.pm b/Bugzilla/DB/Mysql.pm index fad175eac..9ddb46622 100644 --- a/Bugzilla/DB/Mysql.pm +++ b/Bugzilla/DB/Mysql.pm @@ -325,9 +325,8 @@ sub bz_setup_database { # hard to fix later. We do this up here because none of the code below # works if InnoDB is off. (Particularly if we've already converted the # tables to InnoDB.) - my ($innodb_on) = @{$self->selectcol_arrayref( - q{SHOW VARIABLES LIKE '%have_innodb%'}, {Columns=>[2]})}; - if ($innodb_on ne 'YES') { + my %engines = @{$self->selectcol_arrayref('SHOW ENGINES', {Columns => [1,2]})}; + if (!$engines{InnoDB} || $engines{InnoDB} !~ /^(YES|DEFAULT)$/) { die install_string('mysql_innodb_disabled'); } diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm index 39cacedb0..83723b327 100644 --- a/Bugzilla/Install/Requirements.pm +++ b/Bugzilla/Install/Requirements.pm @@ -554,26 +554,6 @@ sub print_module_instructions { ( (!$output and @{$check_results->{missing}}) or ($output and $check_results->{any_missing}) ) ? 1 : 0; - # We only print the PPM repository note if we have to. - my $perl_ver = sprintf('%vd', $^V); - if ($need_module_instructions && ON_ACTIVESTATE && vers_cmp($perl_ver, '5.12') < 0) { - # URL when running Perl 5.8.x. - my $url_to_theory58S = 'http://theoryx5.uwinnipeg.ca/ppms'; - # Packages for Perl 5.10 are not compatible with Perl 5.8. - if (vers_cmp($perl_ver, '5.10') > -1) { - $url_to_theory58S = 'http://cpan.uwinnipeg.ca/PPMPackages/10xx/'; - } - print colored( - install_string('ppm_repo_add', - { theory_url => $url_to_theory58S }), - COLOR_ERROR); - - # ActivePerls older than revision 819 require an additional command. - if (ON_ACTIVESTATE < 819) { - print install_string('ppm_repo_up'); - } - } - if ($need_module_instructions or @{ $check_results->{apache} }) { # If any output was required, we want to close the "table" print "*" x TABLE_WIDTH . "\n"; diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml index 2da3a8e79..d50462271 100644 --- a/docs/en/xml/installation.xml +++ b/docs/en/xml/installation.xml @@ -1582,33 +1582,6 @@ AddType application/rdf+xml .rdf</screen> C:\perl> <command>ppm install <module name></command> </programlisting> - <para> - The best source for the Windows PPM modules needed for Bugzilla - is probably the theory58S website, which you can add to your list - of repositories as follows (for Perl 5.8.x): - </para> - - <programlisting> -<command>ppm repo add theory58S http://theoryx5.uwinnipeg.ca/ppms/</command> - </programlisting> - - <para> - If you are using Perl 5.10.x, you cannot use the same PPM modules as Perl - 5.8.x as they are incompatible. In this case, you should add the following - repository: - </para> - <programlisting> -<command>ppm repo add theory58S http://cpan.uwinnipeg.ca/PPMPackages/10xx/</command> - </programlisting> - - <note> - <para> - In versions prior to 5.8.8 build 819 of PPM the command is - <programlisting> -<command>ppm repository add theory58S http://theoryx5.uwinnipeg.ca/ppms/</command> - </programlisting> - </para> - </note> <note> <para> The PPM repository stores modules in 'packages' that may have diff --git a/docs/en/xml/modules.xml b/docs/en/xml/modules.xml index 933c9de5b..2907dadcd 100644 --- a/docs/en/xml/modules.xml +++ b/docs/en/xml/modules.xml @@ -42,10 +42,8 @@ <para> Running Bugzilla on Windows requires the use of ActiveState Perl 5.8.1 or higher. Many modules already exist in the core - distribution of ActiveState Perl. Additional modules can be downloaded - from <ulink url="http://theoryx5.uwinnipeg.ca/ppms/" /> if you use - Perl 5.8.x or from <ulink url="http://cpan.uwinnipeg.ca/PPMPackages/10xx/" /> - if you use Perl 5.10.x. + distribution of ActiveState Perl. If some modules are missing, upgrade + ActiveState Perl to at least 5.12; it has all the required modules. </para> </note> diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl index 36c3fe252..c96fc014e 100644 --- a/template/en/default/setup/strings.txt.pl +++ b/template/en/default/setup/strings.txt.pl @@ -382,24 +382,6 @@ as well), you should install patchutils from: http://cyberelk.net/tim/patchutils/ END - ppm_repo_add => <<EOT, -*********************************************************************** -* Note For Windows Users * -*********************************************************************** -* In order to install the modules listed below, you first have to run * -* the following command as an Administrator: * -* * -* ppm repo add theory58S ##theory_url## -EOT - ppm_repo_up => <<EOT, -* * -* Then you have to do (also as an Administrator): * -* * -* ppm repo up theory58S * -* * -* Do that last command over and over until you see "theory58S" at the * -* top of the displayed list. * -EOT template_precompile => "Precompiling templates...", template_removal_failed => <<END, WARNING: The directory '##template_cache##' could not be removed. |