mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
Merge mysql.com:/home/jimw/my/mysql-4.1-8136
into mysql.com:/home/jimw/my/mysql-4.1-clean
This commit is contained in:
@@ -272,10 +272,7 @@ foreach my $rdb ( @db_desc ) {
|
|||||||
my $negated;
|
my $negated;
|
||||||
if ($rdb->{t_regex}) {
|
if ($rdb->{t_regex}) {
|
||||||
$t_regex = $rdb->{t_regex}; ## assign temporary regex
|
$t_regex = $rdb->{t_regex}; ## assign temporary regex
|
||||||
$negated = $t_regex =~ tr/~//d; ## remove and count
|
$negated = $t_regex =~ s/^~//; ## note and remove negation operator
|
||||||
## negation operator: we
|
|
||||||
## don't allow ~ in table
|
|
||||||
## names
|
|
||||||
|
|
||||||
$t_regex = qr/$t_regex/; ## make regex string from
|
$t_regex = qr/$t_regex/; ## make regex string from
|
||||||
## user regex
|
## user regex
|
||||||
@@ -820,6 +817,16 @@ sub get_list_of_tables {
|
|||||||
});
|
});
|
||||||
|
|
||||||
my @dbh_tables = eval { $dbh->tables() };
|
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();
|
$dbh->disconnect();
|
||||||
return @dbh_tables;
|
return @dbh_tables;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user