bzr commit into mysql-5.5-next-mr-runtime branch (kristofer.pettersson:2913) Bug#27145

[Kristofer Pettersson]

#At file:///Users/thek/Development/mysql-next-mr-runtime/ based on
revid:magne.mahre@stripped

 2913 Kristofer Pettersson	2009-11-10
      Bug#27145 EXTRA_ACL troubles
      
      Correction of backport patch:
      * Fixed signature of check_access_table() for embedded build
      * Fixed typo for last argument in a check_access() call from UINT_MAX to 0.

    modified:
      sql/mysql_priv.h
      sql/sql_parse.cc
=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h	2009-11-02 11:10:04 +0000
+++ b/sql/mysql_priv.h	2009-11-10 14:56:05 +0000
@@ -1064,9 +1064,9 @@ inline bool check_access(THD *thd, ulong
   return false;
 }
 inline bool check_table_access(THD *thd, ulong requirements,TABLE_LIST *tables,
-                               bool no_errors,
                                bool any_combination_of_privileges_will_do,
-                               uint number)
+                               uint number,
+                               bool no_errors)
 { return false; }
 #endif /*NO_EMBEDDED_ACCESS_CHECKS*/
 

=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2009-11-02 11:10:04 +0000
+++ b/sql/sql_parse.cc	2009-11-10 14:56:05 +0000
@@ -2268,7 +2268,7 @@ mysql_execute_command(THD *thd)
                               privileges_requested,
                               all_tables, FALSE, UINT_MAX, FALSE);
     else
-      res= check_access(thd, privileges_requested, any_db, 0, 0, 0, UINT_MAX);
+      res= check_access(thd, privileges_requested, any_db, 0, 0, 0, 0);
 
     if (res)
       break;


Attachment: [text/bzr-bundle]