diff options
author | unknown <bell@sanja.is.com.ua> | 2003-01-26 21:34:14 +0200 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2003-01-26 21:34:14 +0200 |
commit | 42ba47184c0394b682d4873d5bea4d31e2438b6a (patch) | |
tree | 31c2abc31e9acb20388a8652e15dfb623da9d680 /sql/item.cc | |
parent | a72ebebf5dace430460ebdd9e96322780fcfe882 (diff) | |
parent | fb2226c37656e8e7fd531e2cc42c0a1a0f75e41a (diff) | |
download | mariadb-git-42ba47184c0394b682d4873d5bea4d31e2438b6a.tar.gz |
Merge sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
into sanja.is.com.ua:/home/bell/mysql/work-select-4.1
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/item.cc')
-rw-r--r-- | sql/item.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index d4128341fd3..64d059caea7 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -291,7 +291,7 @@ table_map Item_field::used_tables() const { if (field->table->const_table) return 0; // const item - return field->table->map; + return (depended_from? RAND_TABLE_BIT : field->table->map); } Item * Item_field::get_tmp_table_item() |