Skip to content

M
mariadb
Commit 3392d448 authored by unknown's avatar unknown
Browse files
Options

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

into  mysql.com:/home/elkin/MySQL/MERGE/5.1-new
parents 7562e490 db3a5936
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
sql/sql_acl.cc
View file @ 3392d448
...@@ -32,10 +32,6 @@ ...@@ -32,10 +32,6 @@
#include "sp_head.h" #include "sp_head.h"
#include "sp.h" #include "sp.h"
#ifndef NO_EMBEDDED_ACCESS_CHECKS
#define FIRST_NON_YN_FIELD 26
time_t mysql_db_table_last_check= 0L; time_t mysql_db_table_last_check= 0L;
TABLE_FIELD_W_TYPE mysql_db_table_fields[MYSQL_DB_FIELD_COUNT] = { 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] = { ...@@ -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 class acl_entry :public hash_filo_element
{ {
public: public:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7