From: Date: October 22 2007 9:01am
Subject: bk commit into 5.2 tree (holyfoot:1.2616) BUG#30329
List-Archive: http://lists.mysql.com/commits/36007
X-Bug: 30329
Message-Id: <20071022070146.697052C380A5@hfmain.localdomain>

Below is the list of changes that have just been committed into a local
5.2 repository of hf. When hf 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@stripped, 2007-10-22 12:01:39+05:00, holyfoot@stripped +1 -0
  bug #30329 main.information_schema_chmod test.
  
  the check_grant call was #ifdef-ed inproperly in check_table_access()
  what cause wrong return and crash of the embedded server.

  sql/sql_parse.cc@stripped, 2007-10-22 12:01:36+05:00, holyfoot@stripped +0 -2
    bug #30329 main.information_schema_chmod test.
    
    We don't need these ifdef as check_grant already #ifdef-ed for the
    NO_EMBEDDED_ACCESS_CHECK case, and the check_table_access has to return
    FALSE in this case.

diff -Nrup a/sql/sql_parse.cc b/sql/sql_parse.cc
--- a/sql/sql_parse.cc	2007-10-04 17:22:07 +05:00
+++ b/sql/sql_parse.cc	2007-10-22 12:01:36 +05:00
@@ -4878,10 +4878,8 @@ check_table_access(THD *thd, ulong want_
       goto deny;
   }
   thd->security_ctx= backup_ctx;
-#ifndef NO_EMBEDDED_ACCESS_CHECKS
   return check_grant(thd,want_access & ~EXTRA_ACL,org_tables,
 		       test(want_access & EXTRA_ACL), UINT_MAX, no_errors);
-#endif
 deny:
   thd->security_ctx= backup_ctx;
   return TRUE;