mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 10:15:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '5.5' into 10.1

Browse source
This commit is contained in:
Sergei Golubchik 2019-04-26 14:02:37 +02:00
commit 2ce52790ff
29 changed files with 357 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sql/sql_parse.cc
View file

@ -2629,9 +2629,6 @@ mysql_execute_command(THD *thd)
my_message(ER_SLAVE_IGNORED_TABLE, ER_THD(thd, ER_SLAVE_IGNORED_TABLE),
MYF(0));
}
for (table=all_tables; table; table=table->next_global)
table->updating= TRUE;
}
/*
@ -8002,9 +7999,8 @@ TABLE_LIST *st_select_lex::convert_right_join()
query
*/
void st_select_lex::set_lock_for_tables(thr_lock_type lock_type)
void st_select_lex::set_lock_for_tables(thr_lock_type lock_type, bool for_update)
{
bool for_update= lock_type >= TL_READ_NO_INSERT;
DBUG_ENTER("set_lock_for_tables");
DBUG_PRINT("enter", ("lock_type: %d for_update: %d", lock_type,
for_update));