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

into mysql.com:/home/elkin/MySQL/MERGE/5.1-new

Merge elkin@koti:MySQL/Merge/5.1-new/
into mysql.com:/home/elkin/MySQL/MERGE/5.1-new
3737486d · aelkin@mysql.com · 9b1e80b9 · dd999e9e · 3737486d
Commit 3737486d authored Feb 15, 2006 by aelkin@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

sql/sql_acl.cc sql/sql_acl.cc +4 -4

No files found.
--- 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: