Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into lmy004.:/work/mysql-5.1-bug17289


sql/event_executor.cc:
  Auto merged

sql/event_executor.cc

@@ -110,6 +110,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

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: