Commit 3392d448 authored by unknown's avatar unknown
Browse files

Merge elkin@koti:MySQL/Merge/5.1-new/ 

into  mysql.com:/home/elkin/MySQL/MERGE/5.1-new
parents 7562e490 db3a5936

sql/sql_acl.cc

+4 −4
Original line number Diff line number Diff line
@@ -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: