From 60ea0bfaf69ee21ac51af9a349fa6d01782c0144 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 14 Feb 2006 20:58:19 +0100 Subject: [PATCH 1/2] make it explicitly extern. this should fix build failure on FC4 --- sql/event_executor.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sql/event_executor.cc b/sql/event_executor.cc index 897c782cfee..16d0482e26f 100644 --- a/sql/event_executor.cc +++ b/sql/event_executor.cc @@ -109,6 +109,8 @@ evex_init_mutexes() event_executor_running_global_var= opt_event_executor; } +extern TABLE_FIELD_W_TYPE mysql_db_table_fields[]; +extern time_t mysql_db_table_last_check; /* Opens mysql.db and mysql.user and checks whether From db3a5936d3b632b45bb3b3fe56163c15ac21e475 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 14 Feb 2006 22:21:23 +0100 Subject: [PATCH 2/2] make declarations of mysql_db_table_last_check and mysql_db_table_fields visible event in libmysqld. fixes build problem. sql/sql_acl.cc: make declarations of mysql_db_table_last_check and mysql_db_table_fields visible event in libmysqld --- sql/sql_acl.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 724fd3b9b74..bebee7df8b2 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -32,10 +32,6 @@ #include "sp_head.h" #include "sp.h" -#ifndef NO_EMBEDDED_ACCESS_CHECKS - -#define FIRST_NON_YN_FIELD 26 - time_t mysql_db_table_last_check= 0L; TABLE_FIELD_W_TYPE mysql_db_table_fields[MYSQL_DB_FIELD_COUNT] = { @@ -152,6 +148,10 @@ TABLE_FIELD_W_TYPE mysql_db_table_fields[MYSQL_DB_FIELD_COUNT] = { }; +#ifndef NO_EMBEDDED_ACCESS_CHECKS + +#define FIRST_NON_YN_FIELD 26 + class acl_entry :public hash_filo_element { public: