bk commit into 5.0 tree (gluh:1.2022) BUG#15851

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2022 06/01/16 19:25:26 gluh@stripped +3 -0
  Fix for bug#15851 Unlistable directories yield no info from information_schema
    to skip directories which are not allowed for read

  mysys/my_lib.c
    1.22 06/01/16 19:23:12 gluh@stripped +2 -0
    Fix for bug#15851 Unlistable directories yield no info from information_schema
      to skip directories which are not allowed for read

  mysql-test/t/information_schema.test
    1.67 06/01/16 19:23:12 gluh@stripped +10 -0
    Fix for bug#15851 Unlistable directories yield no info from information_schema
      test case

  mysql-test/r/information_schema.result
    1.95 06/01/16 19:23:12 gluh@stripped +5 -0
    Fix for bug#15851 Unlistable directories yield no info from information_schema
      test result

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Bugs/5.0.15851

--- 1.21/mysys/my_lib.c	Wed Oct 19 19:01:08 2005
+++ 1.22/mysys/my_lib.c	Mon Jan 16 19:23:12 2006
@@ -170,6 +170,8 @@ MY_DIR	*my_dir(const char *path, myf MyF
       bzero(finfo.mystat, sizeof(MY_STAT));
       VOID(strmov(tmp_file,dp->d_name));
       VOID(my_stat(tmp_path, finfo.mystat, MyFlags));
+      if (!(finfo.mystat->st_mode & MY_S_IREAD))
+        continue;
     }
     else
       finfo.mystat= NULL;

--- 1.94/mysql-test/r/information_schema.result	Thu Jan 12 04:02:48 2006
+++ 1.95/mysql-test/r/information_schema.result	Mon Jan 16 19:23:12 2006
@@ -1084,3 +1084,8 @@ DROP TABLE t1;
 DROP VIEW v1;
 DROP FUNCTION func1;
 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;

--- 1.66/mysql-test/t/information_schema.test	Tue Jan  3 14:25:13 2006
+++ 1.67/mysql-test/t/information_schema.test	Mon Jan 16 19:23:12 2006
@@ -790,3 +790,13 @@ DROP TABLE t1;
 DROP VIEW v1;
 DROP FUNCTION func1;
 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;