Removed wrong implementation of CUBE/ROLLUP

Fixed bugfix of INSERT ... SET db_name.table_name.column_name
Changed locking to external-locking
Fix client hangup for some invalid SQL queries.


Docs/manual.texi:
  Changelog & recent incompatible changes to 4.0.3
include/mysqld_error.h:
  New error messages
myisam/ft_boolean_search.c:
  Removed compiler warning
myisam/mi_check.c:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_dynrec.c:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_extra.c:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_key.c:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_open.c:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_packrec.c:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/myisamdef.h:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/sort.c:
  Fixed uninitialized variable
mysql-test/r/insert_set.result:
  Change test case to use database foo
mysql-test/r/union.result:
  Test wrong usage of union
mysql-test/t/insert_set.test:
  Test bug in insert
mysql-test/t/union.test:
  Test wrong usage of union
sql/item.h:
  Indentation cleanup
sql/item_cmpfunc.h:
  Indentation cleanup
sql/item_func.h:
  Indentation cleanup
sql/item_strfunc.h:
  Indentation cleanup
sql/item_sum.h:
  Indentation cleanup
sql/item_timefunc.h:
  Indentation cleanup
sql/item_uniq.h:
  Indentation cleanup
sql/mysql_priv.h:
  Fix that we always generate an error message when calling YYABORT
sql/mysqld.cc:
  Changed command line arguments regarding locking to always use --external-locking
  Disable external locking by default
sql/procedure.h:
  Cleanup
sql/set_var.cc:
  change locking -> external_locking
sql/share/czech/errmsg.txt:
  New error messages
sql/share/danish/errmsg.txt:
  New error messages
sql/share/dutch/errmsg.txt:
  New error messages
sql/share/english/errmsg.txt:
  New error messages
sql/share/estonian/errmsg.txt:
  New error messages
sql/share/french/errmsg.txt:
  New error messages
sql/share/german/errmsg.txt:
  New error messages
sql/share/greek/errmsg.txt:
  New error messages
sql/share/hungarian/errmsg.txt:
  New error messages
sql/share/italian/errmsg.txt:
  New error messages
sql/share/japanese/errmsg.txt:
  New error messages
sql/share/korean/errmsg.txt:
  New error messages
mysql-test/r/olap.result:
  Removed CUBE/ROLLUP
mysql-test/t/olap.test:
  Removed CUBE/ROLLUP
sql/share/norwegian-ny/errmsg.txt:
  New error messages
sql/share/norwegian/errmsg.txt:
  New error messages
sql/share/polish/errmsg.txt:
  New error messages
sql/share/portuguese/errmsg.txt:
  New error messages
sql/share/romanian/errmsg.txt:
  New error messages
sql/share/russian/errmsg.txt:
  New error messages
sql/share/slovak/errmsg.txt:
  New error messages
sql/share/spanish/errmsg.txt:
  New error messages
sql/share/swedish/errmsg.txt:
  New error messages
sql/share/ukrainian/errmsg.txt:
  New error messages
sql/sql_base.cc:
  Removed wrong patch for INSERT...
sql/sql_insert.cc:
  Fix bug in INSERT ... SET db_name.table_name.column_name
sql/sql_lex.h:
  Changed NON_EXISTIONG_ONE -> UNSPECIFIED_OLAP_TYPE
sql/sql_olap.cc:
  Removed wrong implementation of CUBE/ROLLUP
sql/sql_parse.cc:
  Removed wrong implementation of CUBE/ROLLUP
  Added function to give better error messages
sql/sql_select.cc:
  Removed wrong implementation of CUBE/ROLLUP
sql/sql_union.cc:
  Added comment
sql/sql_yacc.yy:
  Fix that we always generate an error message when calling YYABORT

1 files changed, 15 insertions, 15 deletions

diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index 8cda0302af5..9d83a8a9673 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -28,7 +28,7 @@ public:
   Item_bool_func(Item *a) :Item_int_func(a) {}
   Item_bool_func(Item *a,Item *b) :Item_int_func(a,b) {}
   void fix_length_and_dec() { decimals=0; max_length=1; }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 class Item_bool_func2 :public Item_int_func
@@ -48,7 +48,7 @@ public:
   bool have_rev_func() const { return rev_functype() != UNKNOWN_FUNC; }
   void print(String *str) { Item_func::print_op(str); }
   bool is_null() { return test(args[0]->is_null() || args[1]->is_null()); }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -82,7 +82,7 @@ public:
   enum Functype rev_functype() const { return EQUAL_FUNC; }
   cond_result eq_cmp_result() const { return COND_TRUE; }
   const char *func_name() const { return "<=>"; }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -188,7 +188,7 @@ public:
   ~Item_func_interval() { delete item; }
   const char *func_name() const { return "interval"; }
   void update_used_tables();
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -203,7 +203,7 @@ public:
   enum Item_result result_type () const { return cached_result_type; }
   void fix_length_and_dec();
   const char *func_name() const { return "ifnull"; }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -218,7 +218,7 @@ public:
   enum Item_result result_type () const { return cached_result_type; }
   void fix_length_and_dec();
   const char *func_name() const { return "if"; }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -233,7 +233,7 @@ public:
   enum Item_result result_type () const { return cached_result_type; }
   void fix_length_and_dec();
   const char *func_name() const { return "nullif"; }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -248,7 +248,7 @@ public:
   void fix_length_and_dec();
   enum Item_result result_type () const { return cached_result_type; }
   const char *func_name() const { return "coalesce"; }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 class Item_func_case :public Item_func
@@ -269,7 +269,7 @@ public:
   void print(String *str);
   bool fix_fields(THD *thd,struct st_table_list *tlist);
   Item *find_item(String *str);
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -431,7 +431,7 @@ class Item_func_in :public Item_int_func
   enum Functype functype() const { return IN_FUNC; }
   const char *func_name() const { return " IN "; }
   void update_used_tables();
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 
@@ -469,7 +469,7 @@ public:
     }
   }
   optimize_type select_optimize() const { return OPTIMIZE_NULL; }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 class Item_func_isnotnull :public Item_bool_func
@@ -484,7 +484,7 @@ public:
   }
   const char *func_name() const { return "isnotnull"; }
   optimize_type select_optimize() const { return OPTIMIZE_NULL; }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 class Item_func_like :public Item_bool_func2
@@ -518,7 +518,7 @@ public:
   const char *func_name() const { return "like"; }
   void fix_length_and_dec();
   bool fix_fields(THD *thd,struct st_table_list *tlist);
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 #ifdef USE_REGEX
@@ -538,7 +538,7 @@ public:
   longlong val_int();
   bool fix_fields(THD *thd,struct st_table_list *tlist);
   const char *func_name() const { return "regex"; }
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };
 
 #else
@@ -575,7 +575,7 @@ public:
   void print(String *str);
   void split_sum_func(List<Item> &fields);
   friend int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds);
-  virtual unsigned int size_of () { return sizeof(*this);}  
+  unsigned int size_of() { return sizeof(*this);}  
 };