database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

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

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


sql/event_executor.cc:
  Auto merged
This commit is contained in:
unknown
2006-02-14 23:35:13 +01:00
parent ee1b893f99 db3a5936d3
commit a280f0c8bd
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/event_executor.cc
View File

@@ -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

8
sql/sql_acl.cc
View File

@@ -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: