diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-19 00:38:58 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-19 00:38:58 +0300 |
| commit | 424ad58becc12bdc0b0f5b3defaaa92af0e66b8e (patch) | |
| tree | 757f52132618d2c6ba29110ce266a757c8864dd1 /mysql-test | |
| parent | 518787c29965d10f65a7e9c073718076aceb058c (diff) | |
| parent | adc508c9011ded5506277d564c641070c0d9dc4d (diff) | |
| download | mariadb-git-424ad58becc12bdc0b0f5b3defaaa92af0e66b8e.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/merge.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/merge.test | 1 |
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; |