diff options
| author | unknown <serg@serg.mylan> | 2005-09-08 23:11:15 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-09-08 23:11:15 +0200 |
| commit | 5a49a6329043e1cdb24da1b204a099af2446c5c6 (patch) | |
| tree | 11a0d1bf2df1fd833c6054932a138ac841e8f60f /sql/item_cmpfunc.h | |
| parent | 91d05c5234a3c507bcb6aac4cad6968afec34114 (diff) | |
| parent | afbdcd413adf6ff5b15de0e9c5d332aecf66850e (diff) | |
| download | mariadb-git-5a49a6329043e1cdb24da1b204a099af2446c5c6.tar.gz | |
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
sql/item_cmpfunc.h:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 03ab9c5b34d..741ae90108a 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -826,7 +826,7 @@ public: else { args[0]->update_used_tables(); - if (!(used_tables_cache=args[0]->used_tables())) + if ((const_item_cache= !(used_tables_cache= args[0]->used_tables()))) { /* Remember if the value is always NULL or never NULL */ cached_value= (longlong) args[0]->is_null(); |