diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-05 12:56:05 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-05 12:56:05 +0200 |
| commit | 446b3ebdfc75f3a97d349d1347c4900a2e3eee03 (patch) | |
| tree | 1fc75e520ac84591d2e2c647855f153a07ec3190 /sql/sql_derived.h | |
| parent | 8f4de38f65ba89c6273c15c9adb50ab762d03f59 (diff) | |
| parent | 90f09ba8c249e23e015ce9d1d56463869f1a5358 (diff) | |
| download | mariadb-git-446b3ebdfc75f3a97d349d1347c4900a2e3eee03.tar.gz | |
Merge 10.2 into 10.3
FIXME: Properly resolve conflicts between MDEV-18883
and MDEV-7742/MDEV-8305, and record the correct result for
main.log_slow
Diffstat (limited to 'sql/sql_derived.h')
| -rw-r--r-- | sql/sql_derived.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_derived.h b/sql/sql_derived.h index f098cf39083..621a6e9ec24 100644 --- a/sql/sql_derived.h +++ b/sql/sql_derived.h @@ -22,7 +22,6 @@ struct LEX; bool mysql_handle_derived(LEX *lex, uint phases); bool mysql_handle_single_derived(LEX *lex, TABLE_LIST *derived, uint phases); -bool mysql_handle_list_of_derived(LEX *lex, TABLE_LIST *dt_list, uint phases); bool mysql_derived_reinit(THD *thd, LEX *lex, TABLE_LIST *derived); /** |