database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Many files:

Browse Source 
Fix after manual merge
This commit is contained in:
igor@rurik.mysql.com
2003-10-01 23:37:05 -07:00
parent f12cbd4bb8
commit f17ff0bc39
7 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_parse.cc
View File

@@ -1906,7 +1906,8 @@ mysql_execute_command(THD *thd)
case SQLCOM_ASSIGN_TO_KEYCACHE:
{
if (check_db_used(thd, tables) ||
check_access(thd, INDEX_ACL, tables->db, &tables->grant.privilege))
check_access(thd, INDEX_ACL, tables->db,
&tables->grant.privilege, 0, 0))
goto error;
res = mysql_assign_to_keycache(thd, tables);
break;
@@ -1914,7 +1915,8 @@ mysql_execute_command(THD *thd)
case SQLCOM_PRELOAD_KEYS:
{
if (check_db_used(thd, tables) ||
check_access(thd, INDEX_ACL, tables->db, &tables->grant.privilege,0,0))
check_access(thd, INDEX_ACL, tables->db,
&tables->grant.privilege, 0, 0))
goto error;
res = mysql_preload_keys(thd, tables);
break;