summaryrefslogtreecommitdiff
path: root/sql/sql_analyse.h
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2003-07-02 18:34:43 +0500
committerunknown <bar@bar.mysql.r18.ru>2003-07-02 18:34:43 +0500
commit9f6614292b8061063e709147b1282dda84c7f018 (patch)
tree57404c7cd0076832db00a260d7b44107d5ddeb69 /sql/sql_analyse.h
parent7db27aded20baf0e870b23b67225f52ec183a274 (diff)
downloadmariadb-git-9f6614292b8061063e709147b1282dda84c7f018.tar.gz
There is no Item->binary() anymore. It was remain from 4.0.
Diffstat (limited to 'sql/sql_analyse.h')
-rw-r--r--sql/sql_analyse.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/sql_analyse.h b/sql/sql_analyse.h
index 2087e6b2b75..3d1cffecaef 100644
--- a/sql/sql_analyse.h
+++ b/sql/sql_analyse.h
@@ -99,8 +99,6 @@ int collect_string(String *element, element_count count,
int sortcmp2(void* cmp_arg __attribute__((unused)),
const String *a,const String *b);
-int stringcmp2(void* cmp_arg __attribute__((unused)),
- const String *a,const String *b);
class field_str :public field_info
{
@@ -117,8 +115,7 @@ public:
max_arg("",default_charset_info), sum(0),
must_be_blob(0), was_zero_fill(0),
was_maybe_zerofill(0), can_be_still_num(1)
- { init_tree(&tree, 0, 0, sizeof(String), a->binary() ?
- (qsort_cmp2) stringcmp2 : (qsort_cmp2) sortcmp2,
+ { init_tree(&tree, 0, 0, sizeof(String), (qsort_cmp2) sortcmp2,
0, (tree_element_free) free_string, NULL); };
void add();