Merge bk-internal:/home/bk/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


libmysql/libmysql.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged

6 files changed, 93 insertions, 3 deletions

diff --git a/mysql-test/r/federated.result b/mysql-test/r/federated.result
index a012550ef5f..6c815e94b7c 100644
--- a/mysql-test/r/federated.result
+++ b/mysql-test/r/federated.result
@@ -106,7 +106,7 @@ CREATE TABLE federated.`t1%` (
 `name` varchar(32) NOT NULL default ''
     )
 ENGINE="FEDERATED" DEFAULT CHARSET=latin1
-COMMENT='mysql://root@127.0.0.1:9308/federated/t1%';
+COMMENT='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1%';
 INSERT INTO federated.`t1%` (id, name) VALUES (1, 'foo');
 INSERT INTO federated.`t1%` (id, name) VALUES (2, 'fee');
 SELECT * FROM federated.`t1%`;
diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result
index 81663cd9d66..3e06018226d 100644
--- a/mysql-test/r/func_group.result
+++ b/mysql-test/r/func_group.result
@@ -888,3 +888,62 @@ SELECT COUNT(DISTINCT a) FROM t1;
 COUNT(DISTINCT a)
 2
 DROP TABLE t1;
+CREATE TABLE t1 (a int, b int, c int);
+INSERT INTO t1 (a, b, c) VALUES
+(1,1,1), (1,1,2), (1,1,3),
+(1,2,1), (1,2,2), (1,2,3),
+(1,3,1), (1,3,2), (1,3,3),
+(2,1,1), (2,1,2), (2,1,3),
+(2,2,1), (2,2,2), (2,2,3),
+(2,3,1), (2,3,2), (2,3,3),
+(3,1,1), (3,1,2), (3,1,3),
+(3,2,1), (3,2,2), (3,2,3),
+(3,3,1), (3,3,2), (3,3,3);
+SELECT b/c as v, a FROM t1 ORDER BY v;
+v	a
+0.33333	3
+0.33333	1
+0.33333	2
+0.50000	1
+0.50000	2
+0.50000	3
+0.66667	2
+0.66667	1
+0.66667	3
+1.00000	3
+1.00000	2
+1.00000	3
+1.00000	1
+1.00000	2
+1.00000	3
+1.00000	2
+1.00000	1
+1.00000	1
+1.50000	3
+1.50000	2
+1.50000	1
+2.00000	1
+2.00000	3
+2.00000	2
+3.00000	3
+3.00000	2
+3.00000	1
+SELECT b/c as v, SUM(a) FROM t1 GROUP BY v;
+v	SUM(a)
+0.33333	6
+0.50000	6
+0.66667	6
+1.00000	18
+1.50000	6
+2.00000	6
+3.00000	6
+SELECT SUM(a) FROM t1 GROUP BY b/c;
+SUM(a)
+6
+6
+6
+18
+6
+6
+6
+DROP TABLE t1;
diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result
index f57c134b6d0..2413834be4f 100644
--- a/mysql-test/r/kill.result
+++ b/mysql-test/r/kill.result
@@ -5,6 +5,12 @@ select ((@id := kill_id) - kill_id) from t1;
 ((@id := kill_id) - kill_id)
 0
 kill @id;
+select ((@id := kill_id) - kill_id) from t1;
+((@id := kill_id) - kill_id)
+0
+select @id != connection_id();
+@id != connection_id()
+1
 select 4;
 4
 4
diff --git a/mysql-test/t/federated.test b/mysql-test/t/federated.test
index db7e712bd5f..6a0e0bdac79 100644
--- a/mysql-test/t/federated.test
+++ b/mysql-test/t/federated.test
@@ -125,6 +125,7 @@ SELECT * FROM federated.t1;
 DELETE FROM federated.t1;
 DROP TABLE IF EXISTS federated.t1;
 
+--replace_result $SLAVE_MYPORT SLAVE_PORT
 eval CREATE TABLE federated.`t1%` (
     `id` int(20) NOT NULL,
     `name` varchar(32) NOT NULL default ''
diff --git a/mysql-test/t/func_group.test b/mysql-test/t/func_group.test
index 0f03eae7e12..9b6f91067d4 100644
--- a/mysql-test/t/func_group.test
+++ b/mysql-test/t/func_group.test
@@ -601,3 +601,26 @@ INSERT INTO t1 (a) VALUES ("A"), ("a"), ("a "), ("a   "),
                           ("B"), ("b"), ("b "), ("b   ");
 SELECT COUNT(DISTINCT a) FROM t1;
 DROP TABLE t1;
+
+#
+# Test for buf #9210: GROUP BY with expression if a decimal type
+#
+
+CREATE TABLE t1 (a int, b int, c int);
+INSERT INTO t1 (a, b, c) VALUES
+  (1,1,1), (1,1,2), (1,1,3),
+  (1,2,1), (1,2,2), (1,2,3),
+  (1,3,1), (1,3,2), (1,3,3),
+  (2,1,1), (2,1,2), (2,1,3),
+  (2,2,1), (2,2,2), (2,2,3),
+  (2,3,1), (2,3,2), (2,3,3),
+  (3,1,1), (3,1,2), (3,1,3),
+  (3,2,1), (3,2,2), (3,2,3),
+  (3,3,1), (3,3,2), (3,3,3);
+
+SELECT b/c as v, a FROM t1 ORDER BY v;
+SELECT b/c as v, SUM(a) FROM t1 GROUP BY v;
+SELECT SUM(a) FROM t1 GROUP BY b/c;
+
+DROP TABLE t1;
+
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test
index 8a9d96d4946..8492a2a2f8e 100644
--- a/mysql-test/t/kill.test
+++ b/mysql-test/t/kill.test
@@ -27,8 +27,9 @@ kill @id;
 --sleep 5
 # verify that con1 is doning a reconnect
 connection con1;
-ping
-ping
+--ping
+--ping
+select ((@id := kill_id) - kill_id) from t1; 
 select @id != connection_id();
 
 #make sure the server is still alive