Commit b8cd8386 authored by jocuri%softhome.net's avatar jocuri%softhome.net

Patch for bug 264003: Include the DBI error in the error message if 'createdb'…

Patch for bug 264003: Include the DBI error in the error message if 'createdb' fails; patch by Byron Jones (glob) <bugzilla@glob.com.au>; r=kiko, a=justdave.
parent 7db6b82d
......@@ -1455,10 +1455,15 @@ if ($my_db_check) {
my @databases = $dbh->func('_ListDBs');
unless (grep /^$my_db_name$/, @databases) {
print "Creating database $my_db_name ...\n";
$dbh->func('createdb', $my_db_name, 'admin')
or die <<"EOF"
if (!$dbh->func('createdb', $my_db_name, 'admin')) {
my $error = $dbh->errstr;
die <<"EOF"
The '$my_db_name' database is not accessible. This might have several reasons:
The '$my_db_name' database could not be created. The error returned was:
$error
This might have several reasons:
* MySQL is not running.
* MySQL is running, but the rights are not set correct. Go and read the
......@@ -1468,6 +1473,7 @@ The '$my_db_name' database is not accessible. This might have several reasons:
sure all settings in '$localconfig' are correct. If all else fails, set
'\$db_check' to zero.\n
EOF
}
}
$dbh->disconnect if $dbh;
}
......
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