summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/merge.result3
-rw-r--r--mysql-test/t/merge.test1
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
index 1e657883253..f6ca2acc91c 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -470,4 +470,7 @@ CREATE TABLE t ( a int(11) NOT NULL default '0', b int(11) NOT NULL default '0
select max(b) from t where a = 2;
max(b)
NULL
+select max(b) from t1 where a = 2;
+max(b)
+1
drop table if exists t,t1,t2;
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test
index de26d7eb1d3..483ff316740 100644
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@@ -174,4 +174,5 @@ CREATE TABLE t2 ( a int(11) NOT NULL default '0', b int(11) NOT NULL default '
INSERT INTO t2 VALUES (1,2), (2,2);
CREATE TABLE t ( a int(11) NOT NULL default '0', b int(11) NOT NULL default '0', KEY a (a,b)) TYPE=MRG_MyISAM UNION=(t1,t2);
select max(b) from t where a = 2;
+select max(b) from t1 where a = 2;
drop table if exists t,t1,t2;