diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-02-12 23:18:00 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-02-12 23:18:00 +0200 |
| commit | 86ec3c8f085c65b9ac2ef8776cad956465abddd7 (patch) | |
| tree | 924512c54bd3a6090a69986d62adfd8be7ce1fdd /sql/sql_derived.cc | |
| parent | 0a10f78f1245fef3b2a3f5ca9a413ab830ea088e (diff) | |
| parent | c5040dddee0e84076ec7860a9e8ce5df0ced581d (diff) | |
| download | mariadb-git-86ec3c8f085c65b9ac2ef8776cad956465abddd7.tar.gz | |
Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
libmysql/libmysql.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/field.cc:
Auto merged
sql/lex.h:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 1db2f5b9fb8..528bdb7b6f5 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -72,7 +72,7 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, TABLE_LIST *tables= (TABLE_LIST *)sl->table_list.first; TMP_TABLE_PARAM tmp_table_param; bool is_union= sl->next_select() && sl->next_select()->linkage == UNION_TYPE; - bool is_subsel= sl->first_inner_unit(); + bool is_subsel= sl->first_inner_unit() ? 1: 0; SELECT_LEX_NODE *save_current_select= lex->current_select; DBUG_ENTER("mysql_derived"); |