Commit 1cf75bbb authored by unknown's avatar unknown

Bug #27694: mysqlhotcopy & p5-DBD-mysql51-4.003

Use "SHOW TABLES FROM `db`" instead of $dbh->tables() in the
get_list_of_tables() routine.

The symptom is that, when used with recent versions of DBD::mysql,
mysqlhotcopy uses a double-qualified table name, for example:

Invalid db.table name 'test.test`.`x' at /usr/bin/mysqlhotcopy line 855.

This is caused by a change in DBD::mysql.  See this diff:

http://svn.perl.org/viewcvs/modules/DBD-mysql/trunk/lib/DBD/mysql.pm?r1=9183&r2=9188

Basically, older DBD::mysql implemented a limited ->table_info method;
now the full method is implemented, and as a result DBI's ->tables()
method has access to the schema value, so it uses it.


scripts/mysqlhotcopy.sh:
  Use "SHOW TABLES FROM `db`" instead of $dbh->tables() in
  get_list_of_tables().  DBI's ->tables() method calls
  "SHOW TABLES" under the hood, and then quotes the
  names and (depending on DBD::mysql version) adds the schema
  name, too.  mysqlhotcopy doesn't want the schema name
  or the quotes, so it's all around better to just call
  "SHOW TABLES" itself.
parent 48834c07
...@@ -821,30 +821,14 @@ sub get_raid_dirs { ...@@ -821,30 +821,14 @@ sub get_raid_dirs {
sub get_list_of_tables { sub get_list_of_tables {
my ( $db ) = @_; my ( $db ) = @_;
# "use database" cannot cope with database names containing spaces my $tables =
# so create a new connection eval {
$dbh->selectall_arrayref('SHOW TABLES FROM ' .
my $dbh = DBI->connect("dbi:mysql:${db}${dsn};mysql_read_default_group=mysqlhotcopy", $dbh->quote_identifier($db))
$opt{user}, $opt{password}, } || [];
{ warn "Unable to retrieve list of tables in $db: $@" if $@;
RaiseError => 1,
PrintError => 0, return (map { $_->[0] } @$tables);
AutoCommit => 1,
});
my @dbh_tables = eval { $dbh->tables() };
## Remove quotes around table names
my $quote = $dbh->get_info(29); # SQL_IDENTIFIER_QUOTE_CHAR
if ($quote) {
foreach (@dbh_tables) {
s/^$quote(.*)$quote$/$1/;
s/$quote$quote/$quote/g;
}
}
$dbh->disconnect();
return @dbh_tables;
} }
sub quote_names { sub quote_names {
......
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