From cea27d300236436cfc0a0fca6c0993c3867be8f6 Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@askmonty.org>
Date: Tue, 16 Aug 2011 13:28:20 +0300
Subject: [PATCH] Fixed build failure in embedded library regarding that
 decrease_user_connections() was not declared

---
 sql/mysql_priv.h | 3 +++
 sql/sql_acl.cc   | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 38a29686906..22ce8547c96 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -809,6 +809,7 @@ inline bool check_merge_table_access(THD *thd, char *db, TABLE_LIST *table_list)
 inline bool check_some_routine_access(THD *thd, const char *db,
                                       const char *name, bool is_proc)
 { return false; }
+#define decrease_user_connections(X) do { } while(0)       /* nothing */
 #endif /*NO_EMBEDDED_ACCESS_CHECKS*/
 
 bool multi_update_precheck(THD *thd, TABLE_LIST *tables);
@@ -1042,7 +1043,9 @@ bool init_new_connection_handler_thread();
 void reset_mqh(LEX_USER *lu, bool get_them);
 bool check_mqh(THD *thd, uint check_command);
 void time_out_user_resource_limits(THD *thd, USER_CONN *uc);
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
 void decrease_user_connections(USER_CONN *uc);
+#endif
 bool thd_init_client_charset(THD *thd, uint cs_number);
 inline bool is_supported_parser_charset(CHARSET_INFO *cs)
 {
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index bea029b325b..0b97cd69559 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -6977,7 +6977,6 @@ bool check_routine_level_acl(THD *thd, const char *db, const char *name,
 #undef HAVE_OPENSSL
 #ifdef NO_EMBEDDED_ACCESS_CHECKS
 #define initialized 0
-#define decrease_user_connections(X)        /* nothing */
 #define check_for_max_user_connections(X,Y)   0
 #define get_or_create_user_conn(A,B,C,D) 0
 #endif