Commit 74f670f2 authored by unknown's avatar unknown

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/gluh/MySQL/Merge/5.0

parents 30382bee fbc24f33
...@@ -1084,3 +1084,8 @@ DROP TABLE t1; ...@@ -1084,3 +1084,8 @@ DROP TABLE t1;
DROP VIEW v1; DROP VIEW v1;
DROP FUNCTION func1; DROP FUNCTION func1;
DROP FUNCTION func2; DROP FUNCTION func2;
create database mysqltest;
create table mysqltest.t1(a int);
select table_schema from information_schema.tables where table_schema='mysqltest';
table_schema
drop database mysqltest;
...@@ -790,3 +790,13 @@ DROP TABLE t1; ...@@ -790,3 +790,13 @@ DROP TABLE t1;
DROP VIEW v1; DROP VIEW v1;
DROP FUNCTION func1; DROP FUNCTION func1;
DROP FUNCTION func2; DROP FUNCTION func2;
#
# Bug #15851 Unlistable directories yield no info from information_schema
#
create database mysqltest;
create table mysqltest.t1(a int);
--exec chmod -r $MYSQL_TEST_DIR/var/master-data/mysqltest
select table_schema from information_schema.tables where table_schema='mysqltest';
--exec chmod +r $MYSQL_TEST_DIR/var/master-data/mysqltest
drop database mysqltest;
...@@ -170,6 +170,8 @@ MY_DIR *my_dir(const char *path, myf MyFlags) ...@@ -170,6 +170,8 @@ MY_DIR *my_dir(const char *path, myf MyFlags)
bzero(finfo.mystat, sizeof(MY_STAT)); bzero(finfo.mystat, sizeof(MY_STAT));
VOID(strmov(tmp_file,dp->d_name)); VOID(strmov(tmp_file,dp->d_name));
VOID(my_stat(tmp_path, finfo.mystat, MyFlags)); VOID(my_stat(tmp_path, finfo.mystat, MyFlags));
if (!(finfo.mystat->st_mode & MY_S_IREAD))
continue;
} }
else else
finfo.mystat= NULL; finfo.mystat= NULL;
......
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