database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin


sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/handler.cc:
  manual merge
This commit is contained in:
unknown
2006-08-23 16:48:39 +04:00
parent a649c63130 992aceaf71
commit 118677a293
23 changed files with 359 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
sql/sql_acl.cc
View File

@@ -36,114 +36,114 @@ time_t mysql_db_table_last_check= 0L;
TABLE_FIELD_W_TYPE mysql_db_table_fields[MYSQL_DB_FIELD_COUNT] = {
{
{(char *) STRING_WITH_LEN("Host")},
{(char *) STRING_WITH_LEN("char(60)")},
{ C_STRING_WITH_LEN("Host") },
{ C_STRING_WITH_LEN("char(60)") },
{NULL, 0}
},
{
{(char *) STRING_WITH_LEN("Db")},
{(char *) STRING_WITH_LEN("char(64)")},
{ C_STRING_WITH_LEN("Db") },
{ C_STRING_WITH_LEN("char(64)") },
{NULL, 0}
},
{
{(char *) STRING_WITH_LEN("User")},
{(char *) STRING_WITH_LEN("char(16)")},
{ C_STRING_WITH_LEN("User") },
{ C_STRING_WITH_LEN("char(16)") },
{NULL, 0}
},
{
{(char *) STRING_WITH_LEN("Select_priv")},
{(char *) STRING_WITH_LEN("enum('N','Y')")},
{(char *) STRING_WITH_LEN("utf8")}
{ C_STRING_WITH_LEN("Select_priv") },
{ C_STRING_WITH_LEN("enum('N','Y')") },
{ C_STRING_WITH_LEN("utf8") }
},
{
{(char *) STRING_WITH_LEN("Insert_priv")},
{(char *) STRING_WITH_LEN("enum('N','Y')")},
{(char *) STRING_WITH_LEN("utf8")}
{ C_STRING_WITH_LEN("Insert_priv") },
{ C_STRING_WITH_LEN("enum('N','Y')") },
{ C_STRING_WITH_LEN("utf8") }
},
{
{(char *) STRING_WITH_LEN("Update_priv")},
{(char *) STRING_WITH_LEN("enum('N','Y')")},
{(char *) STRING_WITH_LEN("utf8")}
{ C_STRING_WITH_LEN("Update_priv") },
{ C_STRING_WITH_LEN("enum('N','Y')") },
{ C_STRING_WITH_LEN("utf8") }
},
{
{(char *) STRING_WITH_LEN("Delete_priv")},
{(char *) STRING_WITH_LEN("enum('N','Y')")},
{(char *) STRING_WITH_LEN("utf8")}
{ C_STRING_WITH_LEN("Delete_priv") },
{ C_STRING_WITH_LEN("enum('N','Y')") },
{ C_STRING_WITH_LEN("utf8") }
},
{
{(char *) STRING_WITH_LEN("Create_priv")},
{(char *) STRING_WITH_LEN("enum('N','Y')")},
{(char *) STRING_WITH_LEN("utf8")}
{ C_STRING_WITH_LEN("Create_priv") },
{ C_STRING_WITH_LEN("enum('N','Y')") },
{ C_STRING_WITH_LEN("utf8") }
},
{
{(char *) STRING_WITH_LEN("Drop_priv")},
{(char *) STRING_WITH_LEN("enum('N','Y')")},
{(char *) STRING_WITH_LEN("utf8")}
{ C_STRING_WITH_LEN("Drop_priv") },
{ C_STRING_WITH_LEN("enum('N','Y')") },
{ C_STRING_WITH_LEN("utf8") }
},
{
{(char *) STRING_WITH_LEN("Grant_priv")},
{(char *) STRING_WITH_LEN("enum('N','Y')")},
{(char *) STRING_WITH_LEN("utf8")}
{ C_STRING_WITH_LEN("Grant_priv") },
{ C_STRING_WITH_LEN("enum('N','Y')") },
{ C_STRING_WITH_LEN("utf8") }
},
{
{(char *) STRING_WITH_LEN("References_priv")},
{(char *) STRING_WITH_LEN("enum('N','Y')")},
{(char *) STRING_WITH_LEN("utf8")}
{ C_STRING_WITH_LEN("References_priv") },
{ C_STRING_WITH_LEN("enum('N','Y')") },
{ C_STRING_WITH_LEN("utf8") }
},
{
{(char *) STRING_WITH_LEN("Index_priv")},
{(char *) STRING_WITH_LEN("enum('N','Y')")},
{(char *) STRING_WITH_LEN("utf8")}
{ C_STRING_WITH_LEN("Index_priv") },
{ C_STRING_WITH_LEN("enum('N','Y')") },
{ C_STRING_WITH_LEN("utf8") }
},
{
{(char *) STRING_WITH_LEN("Alter_priv")},
{(char *) STRING_WITH_LEN("enum('N','Y')")},
{(char *) STRING_WITH_LEN("utf8")}
{ C_STRING_WITH_LEN("Alter_priv") },
{ C_STRING_WITH_LEN("enum('N','Y')") },
{ C_STRING_WITH_LEN("utf8") }
},
{
{(char *) STRING_WITH_LEN("Create_tmp_table_priv")},
{(char *) STRING_WITH_LEN("enum('N','Y')")},
{(char *) STRING_WITH_LEN("utf8")}
{ C_STRING_WITH_LEN("Create_tmp_table_priv") },
{ C_STRING_WITH_LEN("enum('N','Y')") },
{ C_STRING_WITH_LEN("utf8") }
},
{
{(char *) STRING_WITH_LEN("Lock_tables_priv")},
{(char *) STRING_WITH_LEN("enum('N','Y')")},
{(char *) STRING_WITH_LEN("utf8")}
{ C_STRING_WITH_LEN("Lock_tables_priv") },
{ C_STRING_WITH_LEN("enum('N','Y')") },
{ C_STRING_WITH_LEN("utf8") }
},
{
{(char *) STRING_WITH_LEN("Create_view_priv")},
{(char *) STRING_WITH_LEN("enum('N','Y')")},
{(char *) STRING_WITH_LEN("utf8")}
{ C_STRING_WITH_LEN("Create_view_priv") },
{ C_STRING_WITH_LEN("enum('N','Y')") },
{ C_STRING_WITH_LEN("utf8") }
},
{
{(char *) STRING_WITH_LEN("Show_view_priv")},
{(char *) STRING_WITH_LEN("enum('N','Y')")},
{(char *) STRING_WITH_LEN("utf8")}
{ C_STRING_WITH_LEN("Show_view_priv") },
{ C_STRING_WITH_LEN("enum('N','Y')") },
{ C_STRING_WITH_LEN("utf8") }
},
{
{(char *) STRING_WITH_LEN("Create_routine_priv")},
{(char *) STRING_WITH_LEN("enum('N','Y')")},
{(char *) STRING_WITH_LEN("utf8")}
{ C_STRING_WITH_LEN("Create_routine_priv") },
{ C_STRING_WITH_LEN("enum('N','Y')") },
{ C_STRING_WITH_LEN("utf8") }
},
{
{(char *) STRING_WITH_LEN("Alter_routine_priv")},
{(char *) STRING_WITH_LEN("enum('N','Y')")},
{(char *) STRING_WITH_LEN("utf8")}
{ C_STRING_WITH_LEN("Alter_routine_priv") },
{ C_STRING_WITH_LEN("enum('N','Y')") },
{ C_STRING_WITH_LEN("utf8") }
},
{
{(char *) STRING_WITH_LEN("Execute_priv")},
{(char *) STRING_WITH_LEN("enum('N','Y')")},
{(char *) STRING_WITH_LEN("utf8")}
{ C_STRING_WITH_LEN("Execute_priv") },
{ C_STRING_WITH_LEN("enum('N','Y')") },
{ C_STRING_WITH_LEN("utf8") }
},
{
{(char *) STRING_WITH_LEN("Event_priv")},
{(char *) STRING_WITH_LEN("enum('N','Y')")},
{(char *) STRING_WITH_LEN("utf8")}
{ C_STRING_WITH_LEN("Event_priv") },
{ C_STRING_WITH_LEN("enum('N','Y')") },
{ C_STRING_WITH_LEN("utf8") }
},
{
{(char *) STRING_WITH_LEN("Trigger_priv")},
{(char *) STRING_WITH_LEN("enum('N','Y')")},
{(char *) STRING_WITH_LEN("utf8")}
{ C_STRING_WITH_LEN("Trigger_priv") },
{ C_STRING_WITH_LEN("enum('N','Y')") },
{ C_STRING_WITH_LEN("utf8") }
}
};