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

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

Browse Source 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
This commit is contained in:
tulin@dl145b.mysql.com
2005-06-17 23:13:38 +02:00
parent 6e9427544d 362a83d2f2
commit ebc2050c25
24 changed files with 171 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_base.cc
View File

@@ -3022,7 +3022,7 @@ int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields,
Item *item;
List_iterator<Item> it(fields);
Item_arena *arena, backup;
Query_arena *arena, backup;
DBUG_ENTER("setup_wild");
/*
@@ -3306,7 +3306,7 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table,
any_privileges 0 If we should ensure that we have SELECT privileges
for all columns
1 If any privilege is ok
allocate_view_names if true view names will be copied to current Item_arena
allocate_view_names if true view names will be copied to current Query_arena
memory (made for SP/PS)
RETURN
0 ok
@@ -3566,7 +3566,7 @@ err:
int setup_conds(THD *thd, TABLE_LIST *tables, TABLE_LIST *leaves, COND **conds)
{
SELECT_LEX *select_lex= thd->lex->current_select;
Item_arena *arena= thd->current_arena, backup;
Query_arena *arena= thd->current_arena, backup;
bool save_wrapper= thd->lex->current_select->no_wrap_view_item;
TABLE_LIST *table= NULL; // For HP compilers
DBUG_ENTER("setup_conds");