[Commits] Rev 3018: Fixed build failure in embedded library regarding that decrease_user_connections() was not declared in lp:maria/5.2

Michael Widenius monty at askmonty.org
Tue Aug 16 13:28:21 EEST 2011


At lp:maria/5.2

------------------------------------------------------------
revno: 3018
revision-id: monty at askmonty.org-20110816102820-ijbw4f8grblridvz
parent: monty at askmonty.org-20110816100607-lz1b04v0fipym3aj
committer: Michael Widenius <monty at askmonty.org>
branch nick: maria-5.2
timestamp: Tue 2011-08-16 13:28:20 +0300
message:
  Fixed build failure in embedded library regarding that decrease_user_connections() was not declared
-------------- next part --------------
=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h	2011-07-21 10:15:09 +0000
+++ b/sql/mysql_priv.h	2011-08-16 10:28:20 +0000
@@ -809,6 +809,7 @@ inline bool check_merge_table_access(THD
 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)
 {

=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2011-08-16 09:32:06 +0000
+++ b/sql/sql_acl.cc	2011-08-16 10:28:20 +0000
@@ -6977,7 +6977,6 @@ bool check_routine_level_acl(THD *thd, c
 #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



More information about the commits mailing list