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

merged

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2003-07-03 11:59:57 +03:00
parent 28207ede02 74b74ad5e7
commit 73fdf52fa2
43 changed files with 877 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_parse.cc
View File

@@ -1057,6 +1057,11 @@ bool do_command(THD *thd)
net= &thd->net;
thd->current_tablenr=0;
/*
indicator of uninitialized lex => normal flow of errors handling
(see my_message_sql)
*/
thd->lex.current_select= 0;
packet=0;
old_timeout=net->read_timeout;
@@ -3388,11 +3393,6 @@ static bool check_merge_table_access(THD *thd, char *db,
{
if (!tmp->db || !tmp->db[0])
tmp->db=db;
else if (strcmp(tmp->db,db))
{
send_error(thd,ER_UNION_TABLES_IN_DIFFERENT_DIR);
return 1;
}
}
error=check_table_access(thd, SELECT_ACL | UPDATE_ACL | DELETE_ACL,
table_list);
@@ -4439,6 +4439,7 @@ static bool append_file_to_dir(THD *thd, char **filename_ptr, char *table_name)
return 0;
}
/*
Check if the select is a simple select (not an union)