cleanup: cosmetic fixes

Author: vuvova

mysql-test/r/func_gconcat.result

@@ -1,4 +1,3 @@
-drop table if exists t1, t2;
 create table t1 (grp int, a bigint unsigned, c char(10) not null, d char(10) not null);
 insert into t1 values (1,1,"a","a");
 insert into t1 values (2,2,"b","a");

mysql-test/t/func_gconcat.test

@@ -1,9 +1,6 @@
 #
 # simple test of group_concat function
 #
---disable_warnings
-drop table if exists t1, t2;
---enable_warnings
 
 create table t1 (grp int, a bigint unsigned, c char(10) not null, d char(10) not null);
 insert into t1 values (1,1,"a","a");

mysys/tree.c

@@ -224,7 +224,7 @@ TREE_ELEMENT *tree_insert(TREE *tree, void *key, uint key_size,
   {
     uint alloc_size;
     if (tree->flag & TREE_ONLY_DUPS)
-      return((TREE_ELEMENT *) 1);
+      return TREE_ELEMENT_UNIQUE;
     alloc_size=sizeof(TREE_ELEMENT)+key_size+tree->size_of_element;
     tree->allocated+=alloc_size;
 

sql/item_sum.h

@@ -1479,8 +1479,8 @@ class Item_func_group_concat : public Item_sum
 
   enum Sumfunctype sum_func () const {return GROUP_CONCAT_FUNC;}
   const char *func_name() const { return "group_concat"; }
-  virtual Item_result result_type () const { return STRING_RESULT; }
-  virtual Field *make_string_field(TABLE *table);
+  Item_result result_type () const { return STRING_RESULT; }
+  Field *make_string_field(TABLE *table);
   enum_field_types field_type() const
   {
     if (too_big_for_varchar())
@@ -1522,8 +1522,8 @@ class Item_func_group_concat : public Item_sum
   String* val_str(String* str);
   Item *copy_or_same(THD* thd);
   void no_rows_in_result() {}
-  virtual void print(String *str, enum_query_type query_type);
-  virtual bool change_context_processor(uchar *cntx)
+  void print(String *str, enum_query_type query_type);
+  bool change_context_processor(uchar *cntx)
     { context= (Name_resolution_context *)cntx; return FALSE; }
 };
 

sql/sql_class.h

@@ -36,6 +36,7 @@
 #include "violite.h"        /* vio_is_connected */
 #include "thr_lock.h"       /* thr_lock_type, THR_LOCK_DATA, THR_LOCK_INFO */
 #include "thr_timer.h"
+#include <my_tree.h>
 
 #include "sql_digest_stream.h"            // sql_digest_state