database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2017-10-24 14:53:18 +02:00
parent 4ec88ea9c3 2aa51f528f
commit e0a1c745ec
186 changed files with 3332 additions and 1603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_delete.cc
View File

@ -762,7 +762,7 @@ l
DBUG_RETURN(TRUE);
if ((wild_num && setup_wild(thd, table_list, field_list, NULL, wild_num)) ||
setup_fields(thd, Ref_ptr_array(),
field_list, MARK_COLUMNS_READ, NULL, 0) ||
field_list, MARK_COLUMNS_READ, NULL, NULL, 0) ||
setup_conds(thd, table_list, select_lex->leaf_tables, conds) ||
setup_ftfuncs(select_lex))
DBUG_RETURN(TRUE);