diff options
| author | unknown <igor@rurik.mysql.com> | 2005-10-22 19:35:37 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-10-22 19:35:37 -0700 |
| commit | cd49e32407dcc88a86a26b4c8720afd9ef99b7dd (patch) | |
| tree | ebe3a32ff819aa215d075626945538fd5178dbf5 /sql/item.h | |
| parent | d29ecd5e91adf6eaeb4f2afef0db30648fe08065 (diff) | |
| parent | 8a84dd7e7f9d699c84d2ed52fe6189f01e6d0ce6 (diff) | |
| download | mariadb-git-cd49e32407dcc88a86a26b4c8720afd9ef99b7dd.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 3e52cbe5fd7..d29dcbf2d4f 100644 --- a/sql/item.h +++ b/sql/item.h @@ -599,7 +599,7 @@ public: List<Item> &fields) {} /* Called for items that really have to be split */ void split_sum_func2(THD *thd, Item **ref_pointer_array, List<Item> &fields, - Item **ref); + Item **ref, bool skip_registered); virtual bool get_date(TIME *ltime,uint fuzzydate); virtual bool get_time(TIME *ltime); virtual bool get_date_result(TIME *ltime,uint fuzzydate) |