database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

changes for mysqladmin debug

Browse Source 
and a bug fix for derived tables
This commit is contained in:
Sinisa@sinisa.nasamreza.org
2002-10-30 16:52:12 +02:00
parent 3c570209df
commit 5fbd7b63c5
6 changed files with 122 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_parse.cc
View File

@ -1388,10 +1388,14 @@ mysql_execute_command(THD *thd)
for (TABLE_LIST *cursor= tables;
cursor;
cursor= cursor->next)
if (cursor->derived && mysql_derived(thd, lex,
if (cursor->derived && (res=mysql_derived(thd, lex,
(SELECT_LEX_UNIT *)cursor->derived,
cursor, 0))
cursor, 0)))
{
if (res < 0)
send_error(thd,thd->killed ? ER_SERVER_SHUTDOWN : 0);
DBUG_VOID_RETURN;
}
}
if ((lex->select_lex.next_select_in_list() &&
lex->unit.create_total_list(thd, lex, &tables)) ||
@ -2777,7 +2781,7 @@ check_table_access(THD *thd, ulong want_access,TABLE_LIST *tables,
found=1;
}
}
else if (check_access(thd,want_access,tables->db,&tables->grant.privilege,
else if (tables->db && check_access(thd,want_access,tables->db,&tables->grant.privilege,
0, no_errors))
return TRUE;
}