From 02b1eb988d917d08a94d5e55b7846d6c9d97549e Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 14 Jun 2005 17:50:24 +0500 Subject: [PATCH] Addition to fix for bug #11314 (test case wasn't complete) mysql-test/r/func_default.result: test result fixed mysql-test/t/func_default.test: test case fixed --- mysql-test/r/func_default.result | 5 +++++ mysql-test/t/func_default.test | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/func_default.result b/mysql-test/r/func_default.result index c7483027322..5742ddd102b 100644 --- a/mysql-test/r/func_default.result +++ b/mysql-test/r/func_default.result @@ -16,3 +16,8 @@ explain select * from t1 where str <> default(str); 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; diff --git a/mysql-test/t/func_default.test b/mysql-test/t/func_default.test index 963d069fdd2..af7ebcf588b 100644 --- a/mysql-test/t/func_default.test +++ b/mysql-test/t/func_default.test @@ -21,8 +21,9 @@ drop table t1; # # 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;