michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-06-20 03:10:30 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Avoid problems with information_schema existing but views table now

Browse Source
This commit is contained in:
Jamie Cameron
2007-05-15 18:11:05 +00:00
parent 5ecafb89fc
commit eee37cc0ad
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql/CHANGELOG
View File

@@ -51,3 +51,5 @@ Added access control options to prevent the viewing and management of views and
When there are too many databases or tables to display, a menu for editing a specific one is displayed in addition to the search field.
---- Changes since 1.330 ----
Fixed a bug that prevents compression from being done when backing up all databases.
---- Changes since 1.340 ----
Improved detection of support for views, which avoids errors with information_schema.views.

34
mysql/mysql-lib.pl
View File

@@ -120,20 +120,21 @@ close(DBS);
return map { $_->[0] } @{$t->{'data'}};
}
# list_tables(database, [empty-if-denied])
# list_tables(database, [empty-if-denied], [no-filter-views])
# Returns a list of tables in some database
sub list_tables
{
if ($_[0] =~ /_/) {
open(DBS, "\"$config{'mysqlshow'}\" $authstr ".quotemeta($_[0])." % 2>&1 |");
local ($db, $empty_denied, $include_views) = @_;
if ($db =~ /_/) {
open(DBS, "\"$config{'mysqlshow'}\" $authstr ".quotemeta($db)." % 2>&1 |");
}
else {
open(DBS, "\"$config{'mysqlshow'}\" $authstr ".quotemeta($_[0])." 2>&1 |");
open(DBS, "\"$config{'mysqlshow'}\" $authstr ".quotemeta($db)." 2>&1 |");
}
local $t = &parse_mysql_table(DBS);
close(DBS);
if ($t =~ /access denied/i) {
if ($_[1]) {
if ($empty_denied) {
return ( );
}
else {
@@ -143,10 +144,12 @@ if ($t =~ /access denied/i) {
elsif (!ref($t)) {
&error("<tt>$t</tt>");
}
# Filter out views
local %views;
if (&supports_views()) {
%views = map { $_, 1 } &list_views($_[0]);
if (!$include_views) {
# Filter out views
if (&supports_views()) {
%views = map { $_, 1 } &list_views($_[0]);
}
}
return grep { !$views{$_} } map { $_->[0] } @{$t->{'data'}};
}
@@ -493,8 +496,19 @@ if (!defined($supports_views_cache)) {
}
else {
local @dbs = &list_databases();
$supports_views_cache =
&indexof("information_schema", @dbs) >= 0 ? 1 : 0;
if (&indexof("information_schema", @dbs) >= 0) {
# Has information_schema DB .. but does it have views?
local @ist = &list_tables("information_schema", 1, 1);
if (&indexoflc("views", @ist) >= 0) {
$supports_views_cache = 1;
}
else {
$supports_views_cache = 0;
}
}
else {
$supports_views_cache = 0;
}
}
}
return $supports_views_cache;