diff options
| author | unknown <jimw@mysql.com> | 2005-05-07 08:25:58 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-05-07 08:25:58 -0700 |
| commit | 474a4d5d8d997f7cc068a8d1b4a14138e3bc55af (patch) | |
| tree | 0a1534765795d08014f77b4124d29d383bf130ed /mysql-test/r | |
| parent | de275d94d2b69048e973986e3df3dad8beb6f332 (diff) | |
| parent | 29fcd4b318cccf96fbdd68232c9b0596ead04f9d (diff) | |
| download | mariadb-git-474a4d5d8d997f7cc068a8d1b4a14138e3bc55af.tar.gz | |
Merge
BUILD/FINISH.sh:
Auto merged
client/mysql.cc:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/ha_heap.cc:
Auto merged
mysql-test/r/create.result:
Merge changes
mysql-test/r/temp_table.result:
SCCS merged
mysql-test/t/temp_table.test:
Merge new tests
sql/item.cc:
Merge from 4.1
sql/sql_select.cc:
Merge from 4.1
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/create.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/innodb.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/temp_table.result | 9 | ||||
| -rw-r--r-- | mysql-test/r/type_float.result | 2 |
4 files changed, 19 insertions, 4 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index 82c0f4c1ce5..fc7fee8f997 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -448,11 +448,11 @@ Table Create Table t2 CREATE TABLE `t2` ( `ifnull(a,a)` tinyint(4) default NULL, `ifnull(b,b)` smallint(6) default NULL, - `ifnull(c,c)` mediumint(9) default NULL, + `ifnull(c,c)` mediumint(8) default NULL, `ifnull(d,d)` int(11) default NULL, `ifnull(e,e)` bigint(20) default NULL, - `ifnull(f,f)` float(3,2) default NULL, - `ifnull(g,g)` double(4,3) default NULL, + `ifnull(f,f)` float(24,2) default NULL, + `ifnull(g,g)` double(53,3) default NULL, `ifnull(h,h)` decimal(5,4) default NULL, `ifnull(i,i)` year(4) default NULL, `ifnull(j,j)` date default NULL, diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index d6cfefff9e6..b22330c7f90 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -2391,3 +2391,9 @@ drop table t1; set storage_engine=MyISAM; create table t1 (v varchar(16384)) engine=innodb; drop table t1; +create table t1(a int(1) , b int(1)) engine=innodb; +insert into t1 values ('1111', '3333'); +select distinct concat(a, b) from t1; +concat(a, b) +11113333 +drop table t1; diff --git a/mysql-test/r/temp_table.result b/mysql-test/r/temp_table.result index f43fd09982a..081bd35622e 100644 --- a/mysql-test/r/temp_table.result +++ b/mysql-test/r/temp_table.result @@ -123,3 +123,12 @@ select * from t1; A This is view again drop view t1; +create table t1 (a int, b int, index(a), index(b)); +create table t2 (c int auto_increment, d varchar(255), primary key (c)); +insert into t1 values (3,1),(3,2); +insert into t2 values (NULL, 'foo'), (NULL, 'bar'); +select d, c from t1 left join t2 on b = c where a = 3 order by d; +d c +bar 2 +foo 1 +drop table t1, t2; diff --git a/mysql-test/r/type_float.result b/mysql-test/r/type_float.result index 3cdf35f5032..b0b3ab147b0 100644 --- a/mysql-test/r/type_float.result +++ b/mysql-test/r/type_float.result @@ -92,7 +92,7 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( `col1` double default NULL, - `col2` double(22,5) default NULL, + `col2` double(53,5) default NULL, `col3` double default NULL, `col4` double default NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 |