cleanup: simplify opening of priv tables

prepare TABLE_LIST in a loop and just before opening don't store TABLE_LIST inside Grant_table_base.

cleanup: simplify opening of priv tables
prepare TABLE_LIST in a loop and just before opening don't store TABLE_LIST inside Grant_table_base.
9887d2e8 · Sergei Golubchik · a701426b · 9887d2e8 · 9887d2e8 · 9887d2e8
Commit 9887d2e8 authored Nov 22, 2018 by Sergei Golubchik
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 189 additions and 342 deletions

sql/sql_acl.cc sql/sql_acl.cc +188 -339

sql/table.cc sql/table.cc +0 -2

sql/table.h sql/table.h +1 -1

No files found.
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -70,8 +70,6 @@ LEX_CSTRING GENERAL_LOG_NAME= {STRING_WITH_LEN("general_log")};
 LEX_CSTRING SLOW_LOG_NAME= {STRING_WITH_LEN("slow_log")};
 LEX_CSTRING TRANSACTION_REG_NAME= {STRING_WITH_LEN("transaction_registry")};
-LEX_CSTRING MYSQL_USER_NAME= {STRING_WITH_LEN("user")};
-LEX_CSTRING MYSQL_DB_NAME= {STRING_WITH_LEN("db")};
 LEX_CSTRING MYSQL_PROC_NAME= {STRING_WITH_LEN("proc")};
 /* 

--- a/sql/table.h
+++ b/sql/table.h
@@ -2952,7 +2952,7 @@ extern LEX_CSTRING INFORMATION_SCHEMA_NAME;
 extern LEX_CSTRING MYSQL_SCHEMA_NAME;
 /* table names */
-extern LEX_CSTRING MYSQL_USER_NAME, MYSQL_DB_NAME, MYSQL_PROC_NAME;
+extern LEX_CSTRING MYSQL_PROC_NAME;
 inline bool is_infoschema_db(const LEX_CSTRING *name)
 {