bk commit into 5.0 tree (hf:1.1926) BUG#11314

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 repository of hf. When hf 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
  1.1926 05/06/14 17:50:24 hf@deer.(none) +2 -0
  Addition to fix for bug #11314 (test case wasn't complete)

  mysql-test/t/func_default.test
    1.4 05/06/14 17:50:19 hf@deer.(none) +2 -1
    test case fixed

  mysql-test/r/func_default.result
    1.5 05/06/14 17:50:19 hf@deer.(none) +5 -0
    test result fixed

# 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:	hf
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-5.0.clean

--- 1.4/mysql-test/r/func_default.result	Tue Jul 20 10:48:24 2004
+++ 1.5/mysql-test/r/func_default.result	Tue Jun 14 17:50:19 2005
@@ -16,3 +16,8 @@
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	1	
 drop table t1;
+CREATE TABLE t1 (id int(11), s varchar(20));
+INSERT INTO t1 VALUES (1, 'one'), (2, 'two'), (3, 'three');
+SELECT s, 32 AS mi FROM t1 GROUP BY s HAVING DEFAULT(mi) IS NULL;
+ERROR HY000: Field 'mi' doesn't have a default value
+DROP TABLE t1;

--- 1.3/mysql-test/t/func_default.test	Tue Jun 14 17:42:47 2005
+++ 1.4/mysql-test/t/func_default.test	Tue Jun 14 17:50:19 2005
@@ -21,8 +21,9 @@
 #
 # Bug #11314 (HAVING DEFAULT() hangs)
 #
-CREATE TABLE t1 (s varchar(20), id int(11));
+CREATE TABLE t1 (id int(11), s varchar(20));
 INSERT INTO t1 VALUES (1, 'one'), (2, 'two'), (3, 'three');
+--error 1364
 SELECT s, 32 AS mi FROM t1 GROUP BY s HAVING DEFAULT(mi) IS NULL;
 DROP TABLE t1;