diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2001-06-07 14:25:45 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2001-06-07 14:25:45 +0300 |
| commit | 9cda81a4b88e9fe47c08d06581fc821e388668dc (patch) | |
| tree | b3c1e122b6246bbc25260ca2c75dded85322f124 /sql/item_sum.cc | |
| parent | 17bc31504df4a9590d9ebb340074aceb509630ca (diff) | |
| parent | 823586b2c755a6a64861b7a8e292baf4750f6ee2 (diff) | |
| download | mariadb-git-9cda81a4b88e9fe47c08d06581fc821e388668dc.tar.gz | |
bk resolve work
BitKeeper/etc/logging_ok:
auto-union
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_lex.h:
Added SQLCOM_MULTI_DELETE
sql/sql_parse.cc:
added division of LEX while keeping Monty's code for symlinks
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index edfa16065b9..fb20d31ee90 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -884,7 +884,7 @@ bool Item_sum_count_distinct::setup(THD *thd) tmp_table_param->cleanup(); } if (!(table=create_tmp_table(thd, tmp_table_param, list, (ORDER*) 0, 1, - 0, 0, current_lex->options | thd->options))) + 0, 0, current_lex->select->options | thd->options))) return 1; table->file->extra(HA_EXTRA_NO_ROWS); // Don't update rows table->no_rows=1; |