diff options
| author | unknown <monty@mysql.com> | 2004-07-15 04:28:42 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-07-15 04:28:42 +0300 |
| commit | a96bb92f4a6542409e801c1410d58fa36eb55cad (patch) | |
| tree | fc4aab8e00b642d92acb665697ea33f18288f4be /sql/sql_derived.cc | |
| parent | c78da28a4f9489ff8a6268f836512ce1dc4bc44d (diff) | |
| parent | 46ea874fb78743e1a315fbfa09b012dc382fcbbf (diff) | |
| download | mariadb-git-a96bb92f4a6542409e801c1410d58fa36eb55cad.tar.gz | |
Merge
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 46794f45f3c..48bc6f4c5a2 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -117,7 +117,6 @@ static int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, select_union *derived_result; bool is_union= first_select->next_select() && first_select->next_select()->linkage == UNION_TYPE; - bool is_subsel= first_select->first_inner_unit() ? 1: 0; SELECT_LEX *save_current_select= lex->current_select; DBUG_ENTER("mysql_derived"); |