diff options
| author | unknown <igor@rurik.mysql.com> | 2006-04-03 21:04:38 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-04-03 21:04:38 -0700 |
| commit | 8ca824b375d645683563ecf162e0c406e32f5eba (patch) | |
| tree | c665451a3387dec7305867642b6c497ef45fa1ba /sql/item_cmpfunc.cc | |
| parent | a5abc598e5efe21b3599e6f4fda9ab02f6194be3 (diff) | |
| parent | f545817ed1d19fb0656ed18650ea15072d8b03ad (diff) | |
| download | mariadb-git-8ca824b375d645683563ecf162e0c406e32f5eba.tar.gz | |
Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
sql/item_cmpfunc.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 62533d12090..65654b150e1 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -3740,7 +3740,7 @@ void Item_equal::sort(Item_field_cmpfunc cmp, void *arg) Check appearance of new constant items in the multiple equality object SYNOPSIS - check() + update_const() DESCRIPTION The function checks appearance of new constant items among @@ -3753,7 +3753,7 @@ void Item_equal::sort(Item_field_cmpfunc cmp, void *arg) none */ -void Item_equal::check_const() +void Item_equal::update_const() { List_iterator<Item_field> it(fields); Item *item; |