diff options
| author | tsmith@ramayana.hindu.god <> | 2007-12-05 12:33:36 -0700 |
|---|---|---|
| committer | tsmith@ramayana.hindu.god <> | 2007-12-05 12:33:36 -0700 |
| commit | 8fc0bfb6b6d94a8b06c0f3a632baa477612b7249 (patch) | |
| tree | 014b7a0c6686c33c9845e9527ebb9f0052457950 /sql/item_cmpfunc.h | |
| parent | 1a87a089a76b6c097100f39ff3c13c0c6cde748e (diff) | |
| parent | 4e08609f03ebd077bdd0843ab1722c8f19735c68 (diff) | |
| download | mariadb-git-8fc0bfb6b6d94a8b06c0f3a632baa477612b7249.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 8df0e1af331..188d87a69ca 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -742,7 +742,7 @@ public: virtual uchar *get_value(Item *item)=0; void sort() { - qsort2(base,used_count,size,compare,collation); + my_qsort2(base,used_count,size,compare,collation); } int find(Item *item); @@ -1145,6 +1145,8 @@ public: Item *find_item(String *str); CHARSET_INFO *compare_collation() { return cmp_collation.collation; } void cleanup(); + void agg_str_lengths(Item *arg); + void agg_num_lengths(Item *arg); }; /* |