diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-17 14:23:48 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-17 14:23:48 +0200 |
| commit | ecdbdeddade483dcdb37c1b82f7e45db46caca0f (patch) | |
| tree | 52fa8a08859a024dba610b0e1d6a59bb82de374e /mysql-test | |
| parent | 4dd2eb198f8ab61ed5b4957851d3c6b04a999014 (diff) | |
| parent | 92d93cae72d8d24595438da31cf8acabe8c6a724 (diff) | |
| download | mariadb-git-ecdbdeddade483dcdb37c1b82f7e45db46caca0f.tar.gz | |
Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
sql/ha_innodb.cc:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/merge.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 86586d5950d..0bffc93c284 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -536,7 +536,7 @@ 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; max(b) -NULL +2 select max(b) from t1 where a = 2; max(b) 1 |