1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lock option in table list

Browse Source 
sql/sql_lex.cc:
  note about methods location
This commit is contained in:
unknown 2002-11-23 18:54:15 +02:00
parent 671ed6ac8b
commit b7bcb96508
3 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_lex.cc
View File

@ -1282,4 +1282,7 @@ List<String>* st_select_lex::get_ignore_index()
return ignore_index_ptr; return ignore_index_ptr;
} }
// There are st_select_lex::add_table_to_list in sql_parse.cc /*
There are st_select_lex::add_table_to_list &
st_select_lex::set_lock_for_tables in sql_parse.cc
*/

24
sql/sql_parse.cc
View File

@ -1426,20 +1426,7 @@ mysql_execute_command(THD *thd)
{ {
if (!result) if (!result)
{ {
if ((result=new select_send())) if (!(result=new select_send()))
{
/*
Normal select:
Change lock if we are using SELECT HIGH PRIORITY,
FOR UPDATE or IN SHARE MODE
TODO: Delete the following loop when locks is set by sql_yacc
*/
TABLE_LIST *table;
for (table = tables ; table ; table=table->next)
table->lock_type= lex->lock_option;
}
else
{ {
res= -1; res= -1;
#ifdef DELETE_ITEMS #ifdef DELETE_ITEMS
@ -1663,9 +1650,6 @@ mysql_execute_command(THD *thd)
TABLE_LIST *table; TABLE_LIST *table;
if (check_table_access(thd, SELECT_ACL, tables->next)) if (check_table_access(thd, SELECT_ACL, tables->next))
goto error; // Error message is given goto error; // Error message is given
/* TODO: Delete the following loop when locks is set by sql_yacc */
for (table = tables->next ; table ; table=table->next)
table->lock_type= lex->lock_option;
} }
unit->offset_limit_cnt= select_lex->offset_limit; unit->offset_limit_cnt= select_lex->offset_limit;
unit->select_limit_cnt= select_lex->select_limit+ unit->select_limit_cnt= select_lex->select_limit+
@ -2023,12 +2007,6 @@ mysql_execute_command(THD *thd)
net_printf(thd,ER_INSERT_TABLE_USED,tables->real_name); net_printf(thd,ER_INSERT_TABLE_USED,tables->real_name);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
{
/* TODO: Delete the following loop when locks is set by sql_yacc */
TABLE_LIST *table;
for (table = tables->next ; table ; table=table->next)
table->lock_type= lex->lock_option;
}
/* Skip first table, which is the table we are inserting in */ /* Skip first table, which is the table we are inserting in */
lex->select_lex.table_list.first= lex->select_lex.table_list.first=

13
sql/sql_yacc.yy
View File

@ -798,7 +798,10 @@ create:
($2 & ($2 &
HA_LEX_CREATE_TMP_TABLE ? HA_LEX_CREATE_TMP_TABLE ?
&tmp_table_alias : &tmp_table_alias :
(LEX_STRING*) 0),1)) (LEX_STRING*) 0),1,
((using_update_log)?
TL_READ_NO_INSERT:
TL_READ)))
YYABORT; YYABORT;
lex->create_list.empty(); lex->create_list.empty();
lex->key_list.empty(); lex->key_list.empty();
@ -2374,8 +2377,9 @@ join_table:
} }
table_ident opt_table_alias opt_key_definition table_ident opt_table_alias opt_key_definition
{ {
SELECT_LEX_NODE *sel=Select; LEX *lex= Lex;
if (!($$= sel->add_table_to_list($2, $3, 0, TL_UNLOCK, SELECT_LEX_NODE *sel= lex->current_select;
if (!($$= sel->add_table_to_list($2, $3, 0, lex->lock_option,
sel->get_use_index(), sel->get_use_index(),
sel->get_ignore_index()))) sel->get_ignore_index())))
YYABORT; YYABORT;
@ -2388,7 +2392,8 @@ join_table:
SELECT_LEX_UNIT *unit= lex->current_select->master_unit(); SELECT_LEX_UNIT *unit= lex->current_select->master_unit();
lex->current_select= unit->outer_select(); lex->current_select= unit->outer_select();
if (!($$= lex->current_select-> if (!($$= lex->current_select->
add_table_to_list(new Table_ident(unit), $5, 0, TL_UNLOCK))) add_table_to_list(new Table_ident(unit), $5, 0,
lex->lock_option)))
YYABORT; YYABORT;
}; };