Skip to content

bugzilla
bugzilla
Commit 90ae4269 authored by mkanat%bugzilla.org's avatar mkanat%bugzilla.org
Browse files
Options

Bug 431201: recode.pl crash when trying to convert 2.16 database to 3.0.3 schema

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=mkanat
parent 4192ccfd
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 10 deletions
contrib/recode.pl
View file @ 90ae4269
...@@ -149,16 +149,9 @@ if ($switch{'guess'}) { ...@@ -149,16 +149,9 @@ if ($switch{'guess'}) {
my $root = ROOT_USER; my $root = ROOT_USER;
print STDERR <<EOT; print STDERR <<EOT;
Using --guess requires that Encode::Detect be installed. To install Using --guess requires that Encode::Detect be installed. To install
Encode::Detect, first download it from: Encode::Detect, run the following command:
http://search.cpan.org/dist/Encode-Detect/ $^X install-module.pl Encode::Detect
Then, unpack it into its own directory and run the following commands
in that directory, as $root:
./Build.PL
./Build
./Build install
EOT EOT
exit; exit;
...@@ -248,7 +241,10 @@ foreach my $table ($dbh->bz_table_list_real) { ...@@ -248,7 +241,10 @@ foreach my $table ($dbh->bz_table_list_real) {
while (my @result = $sth->fetchrow_array) { while (my @result = $sth->fetchrow_array) {
my $data = shift @result; my $data = shift @result;
my $digest = md5_base64($data); # Wide characters cause md5_base64() to die.
my $digest_data = utf8::is_utf8($data)
? Encode::encode_utf8($data) : $data;
my $digest = md5_base64($digest_data);
my @primary_keys = reverse split(',', $pk); my @primary_keys = reverse split(',', $pk);
# We copy the array so that we can pop things from it without # We copy the array so that we can pop things from it without
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment