bk commit into 5.0 tree (evgen:1.2506) BUG#28494

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-02 23:17:46+04:00, evgen@stripped +4 -0
  Bug#28494: Grouping by Item_func_set_user_var produces incorrect result.
  
  This is an additional fix.
  Item::val_xxx methods are supposed to use original data source and
  Item::val_xxx_result methods to use the item's result field. But for the
  Item_func_set_user_var class val_xxx_result methods were mapped to val_xxx
  methods. This leads, in particular, to producing bad sort keys and thus
  wrong order of the result set of queries with group by/order by clauses.
  
  The set of val_xxx_result methods is added to the Item_func_set_user_var
  class. It's the same as the val_xxx set of method but uses the result_field
  to return a value.

  mysql-test/r/user_var.result@stripped, 2007-06-02 23:17:40+04:00, evgen@stripped +11
-3
    Corrected test case for hte bug#28494.

  mysql-test/t/user_var.test@stripped, 2007-06-02 23:17:38+04:00, evgen@stripped +3 -2
    Corrected test case for hte bug#28494.

  sql/item_func.cc@stripped, 2007-06-02 23:17:40+04:00, evgen@stripped +34 -0
    Bug#28494: Grouping by Item_func_set_user_var produces incorrect result.
    The set of val_xxx_result methods is added to the Item_func_set_user_var
    class. It's the same as the val_xxx set of method but uses the result_field
    to return a value.

  sql/item_func.h@stripped, 2007-06-02 23:17:40+04:00, evgen@stripped +4 -0
    Bug#28494: Grouping by Item_func_set_user_var produces incorrect result.
    The set of val_xxx_result methods is added to the Item_func_set_user_var
    class.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	evgen
# Host:	moonbone.local
# Root:	/mnt/gentoo64/work/test-5.0-opt-mysql

--- 1.344/sql/item_func.cc	2007-06-01 01:17:03 +04:00
+++ 1.345/sql/item_func.cc	2007-06-02 23:17:40 +04:00
@@ -4208,6 +4208,40 @@ my_decimal *Item_func_set_user_var::val_
 }
 
 
+double Item_func_set_user_var::val_real_result()
+{
+  DBUG_ASSERT(fixed == 1);
+  check(TRUE);
+  update();					// Store expression
+  return entry->val_real(&null_value);
+}
+
+longlong Item_func_set_user_var::val_int_result()
+{
+  DBUG_ASSERT(fixed == 1);
+  check(TRUE);
+  update();					// Store expression
+  return entry->val_int(&null_value);
+}
+
+String *Item_func_set_user_var::val_str_result(String *str)
+{
+  DBUG_ASSERT(fixed == 1);
+  check(TRUE);
+  update();					// Store expression
+  return entry->val_str(&null_value, str, decimals);
+}
+
+
+my_decimal *Item_func_set_user_var::val_decimal_result(my_decimal *val)
+{
+  DBUG_ASSERT(fixed == 1);
+  check(TRUE);
+  update();					// Store expression
+  return entry->val_decimal(&null_value, val);
+}
+
+
 void Item_func_set_user_var::print(String *str)
 {
   str->append(STRING_WITH_LEN("(@"));

--- 1.170/sql/item_func.h	2007-06-01 01:17:03 +04:00
+++ 1.171/sql/item_func.h	2007-06-02 23:17:40 +04:00
@@ -1208,6 +1208,10 @@ public:
   longlong val_int();
   String *val_str(String *str);
   my_decimal *val_decimal(my_decimal *);
+  double val_real_result();
+  longlong val_int_result();
+  String *val_str_result(String *str);
+  my_decimal *val_decimal_result(my_decimal *);
   bool update_hash(void *ptr, uint length, enum Item_result type,
   		   CHARSET_INFO *cs, Derivation dv, bool unsigned_arg);
   bool send(Protocol *protocol, String *str_arg);

--- 1.45/mysql-test/r/user_var.result	2007-06-01 01:17:03 +04:00
+++ 1.46/mysql-test/r/user_var.result	2007-06-02 23:17:40 +04:00
@@ -318,9 +318,17 @@ SHOW COUNT(*) ERRORS;
 @@session.error_count
 1
 create table t1(f1 int);
-insert into t1 values(1),(1),(2);
-select @a:=f1, count(f1) from t1 group by 1;
+insert into t1 values(1),(1),(2),(3),(4),(1),(3),(1);
+select @a:=f1, count(f1) from t1 group by 1 desc;
 @a:=f1	count(f1)
-1	2
+4	1
+3	2
 2	1
+1	4
+select @a:=f1, count(f1) from t1 group by 1 asc;
+@a:=f1	count(f1)
+1	4
+2	1
+3	2
+4	1
 drop table t1;

--- 1.40/mysql-test/t/user_var.test	2007-06-01 01:17:01 +04:00
+++ 1.41/mysql-test/t/user_var.test	2007-06-02 23:17:38 +04:00
@@ -227,6 +227,7 @@ SHOW COUNT(*) ERRORS;
 # Bug#28494: Grouping by Item_func_set_user_var produces incorrect result.
 #
 create table t1(f1 int);
-insert into t1 values(1),(1),(2);
-select @a:=f1, count(f1) from t1 group by 1;
+insert into t1 values(1),(1),(2),(3),(4),(1),(3),(1);
+select @a:=f1, count(f1) from t1 group by 1 desc;
+select @a:=f1, count(f1) from t1 group by 1 asc;
 drop table t1;