database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
This commit is contained in:
tomas@poseidon.ndb.mysql.com
2005-05-02 13:18:26 +02:00
parent 2df8723808 c83b78169e
commit 145ae3c6f5
158 changed files with 5641 additions and 2071 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_parse.cc
View File

@ -3013,6 +3013,10 @@ unsent_create_error:
goto error;
#else
{
/* Ignore temporary tables if this is "SHOW CREATE VIEW" */
if (lex->only_view)
first_table->skip_temporary= 1;
if (check_db_used(thd, all_tables) ||
check_access(thd, SELECT_ACL | EXTRA_ACL, first_table->db,
&first_table->grant.privilege, 0, 0))
@ -4055,7 +4059,7 @@ unsent_create_error:
{
if (! (thd->client_capabilities & CLIENT_MULTI_RESULTS))
{
my_message(ER_SP_BADSELECT, ER(ER_SP_BADSELECT), MYF(0));
my_error(ER_SP_BADSELECT, MYF(0), sp->m_qname.str);
#ifndef EMBEDDED_LIBRARY
thd->net.no_send_ok= nsok;
#endif