summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2019-04-26 14:02:37 +0200
committerSergei Golubchik <serg@mariadb.org>2019-04-26 14:02:37 +0200
commit2ce52790ffc72c4a4d3670ebf67c6655450620f2 (patch)
tree4be382f34905809f0a19e87574e2b07b91f5cb7c /sql/sql_parse.cc
parentcaa9023c9ed101acbcf6b9bd821a09daeb8271ee (diff)
parent757daa4174ed1b8786d0307852f79885dd08ea89 (diff)
downloadmariadb-git-2ce52790ffc72c4a4d3670ebf67c6655450620f2.tar.gz
Merge branch '5.5' into 10.1
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 6649c60f827..3f9d9190d76 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -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));