bk commit into 5.0 tree (gluh:1.2025) BUG#13202

[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.2025 05/10/07 14:16:44 gluh@stripped +2 -0
  Fix for bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails
    allow select into outfile from I_S tables
    it is enough to add FILE_ACL for I_S tables only to 'check_table_access' function
    as we use 'any_db' for 'check_access' function in places where FILE_ACL is required

  sql/sql_parse.cc
    1.500 05/10/07 14:15:31 gluh@stripped +1 -1
    Fix for bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails
      allow select into outfile from I_S tables
      it is enough to add FILE_ACL for I_S tables only to 'check_table_access' function
      as we use 'any_db' for 'check_access' function in places where FILE_ACL is required

  mysql-test/t/outfile.test
    1.12 05/10/07 14:15:31 gluh@stripped +18 -0
    Fix for bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails
      test case

# 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/Merge/5.0

--- 1.499/sql/sql_parse.cc	Wed Oct  5 22:58:04 2005
+++ 1.500/sql/sql_parse.cc	Fri Oct  7 14:15:31 2005
@@ -5002,7 +5002,7 @@
   for (; tables; tables= tables->next_global)
   {
     if (tables->schema_table && 
-        (want_access & ~(SELECT_ACL | EXTRA_ACL)))
+        (want_access & ~(SELECT_ACL | EXTRA_ACL | FILE_ACL)))
     {
       if (!no_errors)
         my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),

--- 1.11/mysql-test/t/outfile.test	Thu Jul 28 05:21:46 2005
+++ 1.12/mysql-test/t/outfile.test	Fri Oct  7 14:15:31 2005
@@ -65,3 +65,21 @@
 DROP TABLE t1;
 
 # End of 4.1 tests
+
+#
+# Bug#13202  SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails
+#
+disable_query_log;
+eval SELECT * INTO OUTFILE "$MYSQL_TEST_DIR/var/tmp/outfile-test.4"
+FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'
+FROM information_schema.schemata LIMIT 0, 5;
+# enable_query_log;
+--exec rm $MYSQL_TEST_DIR/var/tmp/outfile-test.4
+
+use information_schema;
+# disable_query_log;
+eval SELECT * INTO OUTFILE "$MYSQL_TEST_DIR/var/tmp/outfile-test.4"
+FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'
+FROM schemata LIMIT 0, 5;
+enable_query_log;
+--exec rm $MYSQL_TEST_DIR/var/tmp/outfile-test.4