diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-08-13 10:12:41 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-08-13 10:12:41 +0300 |
| commit | 2f27bbd977067a841ca0a8bedd8a3a92ce773527 (patch) | |
| tree | 1c5a2a50f7c762c374feec4dee0b68299df93cb7 /sql/sql_union.cc | |
| parent | 22422b78135df9d85fe8079f44319f47d33b4e1a (diff) | |
| parent | dc271c8fc362b8ddc8897f3a645aa97e87b1d2f9 (diff) | |
| download | mariadb-git-2f27bbd977067a841ca0a8bedd8a3a92ce773527.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
sql/item_sum.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_union.cc:
Auto merged
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 0b5216d623e..09d9c42ed95 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -178,7 +178,7 @@ int st_select_lex_unit::prepare(THD *thd, select_result *sel_result, (ORDER*) 0, !union_option, 1, (select_cursor->options | thd->options | TMP_TABLE_ALL_COLUMNS), - HA_POS_ERROR))) + HA_POS_ERROR, (char*) ""))) goto err; table->file->extra(HA_EXTRA_WRITE_CACHE); table->file->extra(HA_EXTRA_IGNORE_DUP_KEY); |