diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-28 07:28:05 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-28 07:28:05 +0300 |
| commit | c21867da8c98c6245383eab4f37862f3adc2c626 (patch) | |
| tree | 5cdccafdfa54f95c7cc040d8d171312a572c5e9c /mysql-test/r | |
| parent | 1a57e278c2bf3b93d218cb0f610ba5d3a74e8968 (diff) | |
| parent | cf350ce984ac75ef27d5750af2a11cc9704af7e9 (diff) | |
| download | mariadb-git-c21867da8c98c6245383eab4f37862f3adc2c626.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
acinclude.m4:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Docs/manual.texi:
Auto merged
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/bigint.result | 16 | ||||
| -rw-r--r-- | mysql-test/r/merge.result | 202 | ||||
| -rw-r--r-- | mysql-test/r/type_ranges.result | 2 |
3 files changed, 219 insertions, 1 deletions
diff --git a/mysql-test/r/bigint.result b/mysql-test/r/bigint.result index 46ce0fda2c1..a29a9af06da 100644 --- a/mysql-test/r/bigint.result +++ b/mysql-test/r/bigint.result @@ -13,3 +13,19 @@ a 18446744073709551615 a 18446744073709551614 +min(big) max(big) max(big)-1 +-1 9223372036854775807 9223372036854775806 +min(big) max(big) max(big)-1 +-1 9223372036854775807 9223372036854775806 +min(big) max(big) max(big)-1 +12345678901234567 18446744073709551615 18446744073709551614 +min(big) max(big) max(big)-1 +12345678901234567 18446744073709551615 18446744073709551614 +min(big) max(big) max(big)-1 +12345678901234567 18446744073709551615 18446744073709551614 +min(big) max(big) max(big)-1 +12345678901234567 18446744073709551615 18446744073709551614 +min(big) max(big) max(big)-1 +-1 9223372036854775807 9223372036854775806 +min(big) max(big) max(big)-1 +-1 9223372036854775807 9223372036854775806 diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 653e25af799..704b541e25e 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -81,6 +81,56 @@ a 412 412 411 +a b +1 Testing +1 Testing +2 table +2 table +4 Testing +4 Testing +5 table +5 table +6 t2 +6 t1 +7 Testing +7 Testing +8 table +8 table +9 t2 +9 t2 +a b +1 Testing +1 Testing +2 table +2 table +4 Testing +4 Testing +5 table +5 table +9 t2 +9 t2 +a b +1 Testing +1 Testing +2 table +2 table +3 t2 +3 t2 +4 Testing +4 Testing +5 table +5 table +a b +1 Testing +1 Testing +2 table +2 table +3 t2 +3 t2 +4 Testing +4 Testing +5 table +5 table Table Create Table t3 CREATE TABLE `t3` ( `a` int(11) NOT NULL default '0', @@ -130,3 +180,155 @@ a a b 1 1 1 2 +Table Create Table +t3 CREATE TABLE `t3` ( + `a` int(11) NOT NULL default '0', + `b` int(11) NOT NULL default '0', + KEY `a` (`a`,`b`) +) TYPE=MyISAM +Table Create Table +t4 CREATE TABLE `t4` ( + `a` int(11) NOT NULL default '0', + `b` int(11) NOT NULL default '0', + KEY `a` (`a`,`b`) +) TYPE=MRG_MyISAM UNION=(t1,t2) +Table Create Table +t5 CREATE TABLE `t5` ( + `a` int(11) NOT NULL default '0', + `b` int(11) NOT NULL default '0', + KEY `a` (`a`,`b`) +) TYPE=MRG_MyISAM INSERT_METHOD=FIRST UNION=(t1,t2) +Table Create Table +t6 CREATE TABLE `t6` ( + `a` int(11) NOT NULL default '0', + `b` int(11) NOT NULL default '0', + KEY `a` (`a`,`b`) +) TYPE=MRG_MyISAM INSERT_METHOD=LAST UNION=(t1,t2) +a b +a b +1 1 +2 1 +1 2 +a b +2 2 +1 3 +2 3 +a b +1 4 +2 4 +a b +1 1 +1 2 +1 3 +1 4 +5 1 +5 2 +a b +2 1 +2 2 +2 3 +2 4 +6 1 +6 2 +a b +1 1 +1 2 +1 3 +1 4 +2 1 +2 2 +2 3 +2 4 +5 1 +5 2 +6 1 +6 2 +a b +3 1 +3 2 +3 3 +3 4 +Table Create Table +t4 CREATE TABLE `t4` ( + `a` int(11) NOT NULL default '0', + `b` int(11) NOT NULL default '0', + KEY `a` (`a`,`b`) +) TYPE=MRG_MyISAM UNION=(t1,t2,t3) +a b +1 1 +1 2 +1 3 +1 4 +2 1 +2 2 +2 3 +2 4 +3 1 +3 2 +3 3 +3 4 +5 1 +5 2 +6 1 +6 2 +Table Create Table +t4 CREATE TABLE `t4` ( + `a` int(11) NOT NULL default '0', + `b` int(11) NOT NULL default '0', + KEY `a` (`a`,`b`) +) TYPE=MRG_MyISAM INSERT_METHOD=FIRST UNION=(t1,t2,t3) +a b +1 1 +1 2 +1 3 +1 4 +4 1 +4 2 +5 1 +5 2 +a b +2 1 +2 2 +2 3 +2 4 +6 1 +6 2 +a b +3 1 +3 2 +3 3 +3 4 +a b +1 1 +1 2 +1 3 +1 4 +2 1 +2 2 +2 3 +2 4 +3 1 +3 2 +3 3 +3 4 +4 1 +4 2 +5 1 +5 2 +6 1 +6 2 +a b +1 1 +1 2 +1 3 +1 4 +2 1 +2 2 +2 3 +2 4 +4 1 +4 2 +5 1 +5 2 +6 1 +6 2 diff --git a/mysql-test/r/type_ranges.result b/mysql-test/r/type_ranges.result index abb8ef8cb09..96643cc8710 100644 --- a/mysql-test/r/type_ranges.result +++ b/mysql-test/r/type_ranges.result @@ -131,7 +131,7 @@ auto auto auto auto 16 16 Field Type Null Key Default Extra Privileges -auto bigint(17) PRI 0 select,insert,update,references +auto bigint(17) unsigned PRI 0 select,insert,update,references t1 bigint(1) 0 select,insert,update,references t2 char(1) select,insert,update,references t3 mediumtext select,insert,update,references |