From 08aecd54db76199259fab77745f04b133ca880b7 Mon Sep 17 00:00:00 2001
From: Kristofer Pettersson <kristofer.pettersson@sun.com>
Date: Tue, 10 Nov 2009 15:56:05 +0100
Subject: [PATCH] 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.
---
 sql/mysql_priv.h | 4 ++--
 sql/sql_parse.cc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index d5ecc3dd3dc..5d521fca0f8 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -1064,9 +1064,9 @@ inline bool check_access(THD *thd, ulong access, const char *db,
   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*/
 
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index b99ff1c99c5..b5a088af539 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -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;