Post-merge fixes.

7 files changed, 15 insertions, 17 deletions

diff --git a/sql/item.h b/sql/item.h
index 35e5d4a3666..c08c17ea602 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -236,6 +236,7 @@ public:
   {
     cleanup();
     delete this;
+  }
 };
 
 
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 2753c2a5d53..6507e826b7e 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -281,7 +281,7 @@ Item_sum_sum_distinct::Item_sum_sum_distinct(Item *item)
 
 
 Item_sum_sum_distinct::Item_sum_sum_distinct(THD *thd,
-                                             Item_sum_sum_distinct &original)
+                                             Item_sum_sum_distinct *original)
   :Item_sum_num(thd, original), sum(0.0), tree(0)
 {
   quick_group= 0;
@@ -297,7 +297,7 @@ Item_sum_sum_distinct::~Item_sum_sum_distinct()
 Item *
 Item_sum_sum_distinct::copy_or_same(THD *thd)
 {
-  return new (&thd->mem_root) Item_sum_sum_distinct(thd, *this);
+  return new (&thd->mem_root) Item_sum_sum_distinct(thd, this);
 }
 
 C_MODE_START
diff --git a/sql/item_sum.h b/sql/item_sum.h
index 3d6a9c776b8..1957f652afe 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -166,7 +166,7 @@ class Item_sum_sum_distinct :public Item_sum_num
   double sum;
   Unique *tree;
 private:
-  Item_sum_sum_distinct(THD *thd, Item_sum_sum_distinct &item);
+  Item_sum_sum_distinct(THD *thd, Item_sum_sum_distinct *item);
 public:
   Item_sum_sum_distinct(Item *item_par);
   ~Item_sum_sum_distinct();
diff --git a/sql/lex.h b/sql/lex.h
index 8bf8985a3ab..72888f7d89e 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -251,7 +251,7 @@ static SYMBOL symbols[] = {
   { "KEY",		SYM(KEY_SYM)},
   { "KEYS",		SYM(KEYS)},
   { "KILL",		SYM(KILL_SYM)},
-  { "LANGUAGE",         SYM(LANGAUGE_SYM)},
+  { "LANGUAGE",         SYM(LANGUAGE_SYM)},
   { "LAST",		SYM(LAST_SYM)},
   { "LEADING",		SYM(LEADING)},
   { "LEAVE",            SYM(LEAVE_SYM)},
@@ -487,7 +487,7 @@ static SYMBOL symbols[] = {
   { "VARIABLES",	SYM(VARIABLES)},
   { "VARYING",		SYM(VARYING)},
   { "WARNINGS",		SYM(WARNINGS)},
-  { "WEEK",             SYM(WEEK_SYM)},
+  { "WEEK",		SYM(WEEK_SYM)},
   { "WHEN",		SYM(WHEN_SYM)},
   { "WHERE",		SYM(WHERE)},
   { "WHILE",            SYM(WHILE_SYM)},
@@ -721,7 +721,6 @@ static SYMBOL sql_functions[] = {
   { "UPPER",		F_SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_ucase)},
   { "VARIANCE",		SYM(VARIANCE_SYM)},
   { "VERSION",		F_SYM(FUNC_ARG0),0,CREATE_FUNC(create_func_version)},
-  { "WEEK",		SYM(WEEK_SYM)},
   { "WEEKDAY",		F_SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_weekday)},
   { "WEEKOFYEAR",	F_SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_weekofyear)},
   { "WITHIN",		F_SYM(FUNC_ARG2),0,CREATE_FUNC_GEOM(create_func_within)},
diff --git a/sql/opt_range.h b/sql/opt_range.h
index 40a0e259ddd..1e5f58bc1f5 100644
--- a/sql/opt_range.h
+++ b/sql/opt_range.h
@@ -304,17 +304,14 @@ class SQL_SELECT :public Sql_alloc {
 };
 
 
-class FT_SELECT: public QUICK_SELECT {
+class FT_SELECT: public QUICK_RANGE_SELECT {
 public:
-  FT_SELECT(THD *thd, TABLE *table, uint key):
-    QUICK_SELECT (thd, table, key, 1) { init(); }
+  FT_SELECT(THD *thd, TABLE *table, uint key) :
+      QUICK_RANGE_SELECT (thd, table, key, 1) { init(); }
 
-  int init() { return error= file->ft_init(); }
-  int get_next() { return error= file->ft_read(record); }
+  int init() { return error=file->ft_init(); }
+  int get_next() { return error=file->ft_read(record); }
+  int get_type() { return QS_TYPE_FULLTEXT; }
 };
 
-
-QUICK_RANGE_SELECT *get_quick_select_for_ref(THD *thd, TABLE *table,
-				       struct st_table_ref *ref);
-
 #endif
diff --git a/sql/sp.cc b/sql/sp.cc
index 0d657cddc37..83fbd8c5173 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -504,7 +504,7 @@ db_show_routine_status(THD *thd, int type, const char *wild)
     }
 
     /* Init fields */
-    setup_tables(&tables);
+    setup_tables(&tables, 0);
     for (used_field= &used_fields[0];
 	 used_field->field_name;
 	 used_field++)
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 7b8aa13e214..cf56c9c2074 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -5754,6 +5754,7 @@ simple_ident:
                  (Item*) new Item_field(NullS,NullS,$1.str) :
 	         (Item*) new Item_ref(0,0, NullS,NullS,$1.str);
 	  }
+        }
         | simple_ident_q { $$= $1; }
 	;
 
@@ -5764,7 +5765,7 @@ simple_ident_nospvar:
 	  $$= (sel->parsing_place != SELECT_LEX_NODE::IN_HAVING ||
 	       sel->get_in_sum_expr() > 0) ?
               (Item*) new Item_field(NullS,NullS,$1.str) :
-	      (Item*) new Item_ref(NullS,NullS,$1.str);
+	      (Item*) new Item_ref(0,0,NullS,NullS,$1.str);
 	}
 	| simple_ident_q { $$= $1; }
 	;