Merge stella.local:/home2/mydev/mysql-5.0-axmrg

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged

mysql-test/r/func_misc.result

@@ -212,12 +212,6 @@ test
 SELECT NAME_CONST('test', 'test');
 test
 test
-create table t1 (a int not null);
-insert into t1 values (-1), (-2);
-select min(a) from t1 group by inet_ntoa(a);
-min(a)
--2
-drop table t1;
 CREATE TABLE t1(a INT);
 INSERT INTO t1 VALUES (), (), ();
 SELECT NAME_CONST(a, '1') FROM t1;
@@ -225,6 +219,12 @@ ERROR HY000: Incorrect arguments to NAME_CONST
 SET INSERT_ID= NAME_CONST(a, a);
 ERROR HY000: Incorrect arguments to NAME_CONST
 DROP TABLE t1;
+create table t1 (a int not null);
+insert into t1 values (-1), (-2);
+select min(a) from t1 group by inet_ntoa(a);
+min(a)
+-2
+drop table t1;
 End of 5.0 tests
 select connection_id() > 0;
 connection_id() > 0

mysql-test/t/func_misc.test

@@ -213,14 +213,6 @@ SELECT NAME_CONST('test', 1.0);
 SELECT NAME_CONST('test', -1.0);
 SELECT NAME_CONST('test', 'test');
 
-#
-# Bug #31349: ERROR 1062 (23000): Duplicate entry '' for key 'group_key'
-#
-create table t1 (a int not null);
-insert into t1 values (-1), (-2);
-select min(a) from t1 group by inet_ntoa(a);
-drop table t1;
-
 #
 # Bug #32559: connection hangs on query with name_const
 #
@@ -232,6 +224,14 @@ SELECT NAME_CONST(a, '1') FROM t1;
 SET INSERT_ID= NAME_CONST(a, a);
 DROP TABLE t1;
 
+#
+# Bug #31349: ERROR 1062 (23000): Duplicate entry '' for key 'group_key'
+#
+create table t1 (a int not null);
+insert into t1 values (-1), (-2);
+select min(a) from t1 group by inet_ntoa(a);
+drop table t1;
+
 --echo End of 5.0 tests
 
 #