diff options
| author | bell@sanja.is.com.ua <> | 2003-08-13 10:12:41 +0300 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2003-08-13 10:12:41 +0300 |
| commit | 758129279fd08bd89d1d0e8bb24cd71c845b0bc9 (patch) | |
| tree | 1c5a2a50f7c762c374feec4dee0b68299df93cb7 /sql/sql_derived.cc | |
| parent | f1b1f0d742ab8fe6c5d5d6daccad24cd98956dc6 (diff) | |
| parent | 62849952df209608fc9a4162b92fff6fd0de8407 (diff) | |
| download | mariadb-git-758129279fd08bd89d1d0e8bb24cd71c845b0bc9.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index d7a88ecd53e..b71a803edb8 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -157,7 +157,8 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, is_union && !unit->union_option, 1, (select_cursor->options | thd->options | TMP_TABLE_ALL_COLUMNS), - HA_POS_ERROR))) + HA_POS_ERROR, + org_table_list->alias))) { res= -1; goto exit; |