diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-09-15 14:14:38 +0200 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-09-15 14:14:38 +0200 |
| commit | c97cc113921a74ed2e2450045e57b5ddfb969351 (patch) | |
| tree | c06f430053b575c0cd47f1bd8c68cf1146aedef3 /sql/item.h | |
| parent | e4b044060ca806c3c6a78bc7fc89acf3641f62ad (diff) | |
| parent | 341cc55ab6c3c04c92a40354153668d8e6f32d7e (diff) | |
| download | mariadb-git-c97cc113921a74ed2e2450045e57b5ddfb969351.tar.gz | |
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/type_date.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/insert_update.test:
Auto merged
sql/item.h:
Auto merged
sql/log.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index f1fb2f6a04a..0cfb0b01fd8 100644 --- a/sql/item.h +++ b/sql/item.h @@ -2184,7 +2184,11 @@ public: { return Item_field::save_in_field(field_arg, no_conversions); } - table_map used_tables() const { return (table_map)0L; } + /* + We use RAND_TABLE_BIT to prevent Item_insert_value from + being treated as a constant and precalculated before execution + */ + table_map used_tables() const { return RAND_TABLE_BIT; } bool walk(Item_processor processor, byte *args) { |