diff options
Diffstat (limited to 'storage/tokudb/mysql-test')
31 files changed, 79 insertions, 77 deletions
diff --git a/storage/tokudb/mysql-test/tokudb/r/cluster_create_table.result b/storage/tokudb/mysql-test/tokudb/r/cluster_create_table.result index 914c3edc6ac..02a90c66398 100644 --- a/storage/tokudb/mysql-test/tokudb/r/cluster_create_table.result +++ b/storage/tokudb/mysql-test/tokudb/r/cluster_create_table.result @@ -5,7 +5,7 @@ create table t1(a int, b int, c int, d int, primary key(a), key(b) clustering=ye show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL, `d` int(11) DEFAULT NULL, @@ -16,7 +16,7 @@ create index foo on t1(c,d) clustering=yes; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL, `d` int(11) DEFAULT NULL, @@ -30,10 +30,10 @@ alter table t1 add key bar(d,c,b,a) clustering=yes; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL DEFAULT '0', - `b` int(11) NOT NULL DEFAULT '0', - `c` int(11) NOT NULL DEFAULT '0', - `d` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, + `b` int(11) NOT NULL, + `c` int(11) NOT NULL, + `d` int(11) NOT NULL, PRIMARY KEY (`a`,`b`,`c`,`d`), KEY `b` (`b`) `clustering`=yes, KEY `foo` (`c`,`d`) `clustering`=yes, diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-10.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-10.result index 319048cfd8b..6ebeb298d84 100644 --- a/storage/tokudb/mysql-test/tokudb/r/mvcc-10.result +++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-10.result @@ -5,7 +5,7 @@ create table foo (a int, b varchar (100), primary key (a)) engine=TokuDB; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` varchar(100) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-21.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-21.result index bee7c8b4549..ced1e5b045e 100644 --- a/storage/tokudb/mysql-test/tokudb/r/mvcc-21.result +++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-21.result @@ -5,7 +5,7 @@ create table foo (a int, b varchar (100), primary key (a)) engine=TokuDB; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` varchar(100) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-22.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-22.result index 5d986701785..412f5afb9e0 100644 --- a/storage/tokudb/mysql-test/tokudb/r/mvcc-22.result +++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-22.result @@ -5,7 +5,7 @@ create table foo (a int, b varchar (100), primary key (a)) engine=TokuDB; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` varchar(100) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-23.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-23.result index 9ea3c631d17..9af10709db6 100644 --- a/storage/tokudb/mysql-test/tokudb/r/mvcc-23.result +++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-23.result @@ -5,7 +5,7 @@ create table foo (a int, b varchar (100), primary key (a)) engine=TokuDB; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` varchar(100) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-25.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-25.result index 427d1ca5c3f..69183cf37d3 100644 --- a/storage/tokudb/mysql-test/tokudb/r/mvcc-25.result +++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-25.result @@ -7,14 +7,14 @@ create table bar like foo; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` varchar(100) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 show create table bar; Table Create Table bar CREATE TABLE `bar` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` varchar(100) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-3.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-3.result index 684dd147b07..470771b968f 100644 --- a/storage/tokudb/mysql-test/tokudb/r/mvcc-3.result +++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-3.result @@ -7,7 +7,7 @@ create table foo (a int, b int, primary key (a))engine=TokuDB; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-33.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-33.result index 38acca99831..989cfeb43a1 100644 --- a/storage/tokudb/mysql-test/tokudb/r/mvcc-33.result +++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-33.result @@ -6,7 +6,7 @@ create table foo (a int, b int, c int, primary key (a), key (b))engine=TokuDB; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL, PRIMARY KEY (`a`), diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-34.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-34.result index e1795bbc832..bf1d47f8eae 100644 --- a/storage/tokudb/mysql-test/tokudb/r/mvcc-34.result +++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-34.result @@ -6,7 +6,7 @@ create table foo (a int, b int, c int, primary key (a), key (b))engine=TokuDB; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL, PRIMARY KEY (`a`), diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-35.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-35.result index 86fb9670fce..557609e0345 100644 --- a/storage/tokudb/mysql-test/tokudb/r/mvcc-35.result +++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-35.result @@ -6,7 +6,7 @@ create table foo (a int, b int, c int, primary key (a), key (b))engine=TokuDB; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL, PRIMARY KEY (`a`), diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-36.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-36.result index d982ff3249d..b38f6d98f0e 100644 --- a/storage/tokudb/mysql-test/tokudb/r/mvcc-36.result +++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-36.result @@ -6,7 +6,7 @@ create table foo (a int, b int, c int, primary key (a), key (b))engine=TokuDB; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL, PRIMARY KEY (`a`), diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-37.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-37.result index 3e1ad76dd3d..4319ef036fa 100644 --- a/storage/tokudb/mysql-test/tokudb/r/mvcc-37.result +++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-37.result @@ -6,7 +6,7 @@ create table foo (a int, b int, c int, primary key (a), key (b))engine=TokuDB; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL, PRIMARY KEY (`a`), diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-38.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-38.result index 5ee3c72e91e..9e2996931c6 100644 --- a/storage/tokudb/mysql-test/tokudb/r/mvcc-38.result +++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-38.result @@ -6,7 +6,7 @@ create table foo (a int, b int, c int, primary key (a), key (b))engine=TokUDB; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL, PRIMARY KEY (`a`), diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-4.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-4.result index ce8aa725f5b..5e13ce32a24 100644 --- a/storage/tokudb/mysql-test/tokudb/r/mvcc-4.result +++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-4.result @@ -8,7 +8,7 @@ insert into foo values (1,1); show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-5.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-5.result index 47204dcc7e1..3df8f211589 100644 --- a/storage/tokudb/mysql-test/tokudb/r/mvcc-5.result +++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-5.result @@ -6,7 +6,7 @@ create table foo (a int, b int, primary key (a))engine=TokuDB; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-6.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-6.result index a0c8185b1ab..b45faa49026 100644 --- a/storage/tokudb/mysql-test/tokudb/r/mvcc-6.result +++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-6.result @@ -6,7 +6,7 @@ create table foo (a int, b int, primary key (a), key (b))engine=TokuDB; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, PRIMARY KEY (`a`), KEY `b` (`b`) diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-7.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-7.result index ba78f786c31..3baa212c490 100644 --- a/storage/tokudb/mysql-test/tokudb/r/mvcc-7.result +++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-7.result @@ -6,7 +6,7 @@ create table foo (a int, b int, primary key (a))engine=TokuDB; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-8.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-8.result index 4e310d2d001..450ad63fd42 100644 --- a/storage/tokudb/mysql-test/tokudb/r/mvcc-8.result +++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-8.result @@ -6,7 +6,7 @@ create table foo ( a int, b int, c int, primary key (a), key (b))engine=TokuDB; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL, PRIMARY KEY (`a`), diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-9.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-9.result index b3b45d731f2..7dcae265518 100644 --- a/storage/tokudb/mysql-test/tokudb/r/mvcc-9.result +++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-9.result @@ -5,7 +5,7 @@ create table foo (a int, b varchar (100), primary key (a)) engine=TokuDB; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` varchar(100) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 diff --git a/storage/tokudb/mysql-test/tokudb/r/rows-32m-rand-insert.result b/storage/tokudb/mysql-test/tokudb/r/rows-32m-rand-insert.result index 5c1c53946a4..b287c70469e 100644 --- a/storage/tokudb/mysql-test/tokudb/r/rows-32m-rand-insert.result +++ b/storage/tokudb/mysql-test/tokudb/r/rows-32m-rand-insert.result @@ -1009,6 +1009,7 @@ Table Op Msg_type Msg_text test.t check status OK optimize table t; Table Op Msg_type Msg_text +test.t optimize note Table does not support optimize, doing recreate + analyze instead test.t optimize status OK check table t; Table Op Msg_type Msg_text diff --git a/storage/tokudb/mysql-test/tokudb/r/rows-32m-seq-insert.result b/storage/tokudb/mysql-test/tokudb/r/rows-32m-seq-insert.result index abbf5efdf07..a242cac98c2 100644 --- a/storage/tokudb/mysql-test/tokudb/r/rows-32m-seq-insert.result +++ b/storage/tokudb/mysql-test/tokudb/r/rows-32m-seq-insert.result @@ -1009,6 +1009,7 @@ Table Op Msg_type Msg_text test.t check status OK optimize table t; Table Op Msg_type Msg_text +test.t optimize note Table does not support optimize, doing recreate + analyze instead test.t optimize status OK check table t; Table Op Msg_type Msg_text diff --git a/storage/tokudb/mysql-test/tokudb/r/type_blob.result b/storage/tokudb/mysql-test/tokudb/r/type_blob.result index 21d9f57770e..d6649a95419 100644 --- a/storage/tokudb/mysql-test/tokudb/r/type_blob.result +++ b/storage/tokudb/mysql-test/tokudb/r/type_blob.result @@ -665,10 +665,10 @@ alter table t1 add key (a,b,d,e); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL DEFAULT '0', - `b` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, + `b` int(11) NOT NULL, `c` tinyblob NOT NULL, - `d` int(11) NOT NULL DEFAULT '0', + `d` int(11) NOT NULL, `e` int(11) DEFAULT NULL, PRIMARY KEY (`a`,`b`,`c`(255),`d`), KEY `a` (`a`,`b`,`d`,`e`) diff --git a/storage/tokudb/mysql-test/tokudb/r/type_float.result b/storage/tokudb/mysql-test/tokudb/r/type_float.result index e9abecc1dee..d87fd046fd8 100644 --- a/storage/tokudb/mysql-test/tokudb/r/type_float.result +++ b/storage/tokudb/mysql-test/tokudb/r/type_float.result @@ -246,22 +246,22 @@ show warnings; Level Code Message desc t1; Field Type Null Key Default Extra -x decimal(21,2) NO 0.00 +x decimal(21,2) NO NULL drop table t1; create table t1 select 0.0 x; desc t1; Field Type Null Key Default Extra -x decimal(2,1) NO 0.0 +x decimal(2,1) NO NULL create table t2 select 105213674794682365.00 y; desc t2; Field Type Null Key Default Extra -y decimal(20,2) NO 0.00 +y decimal(20,2) NO NULL create table t3 select x+y a from t1,t2; show warnings; Level Code Message desc t3; Field Type Null Key Default Extra -a decimal(21,2) NO 0.00 +a decimal(21,2) NO NULL drop table t1,t2,t3; select 1e-308, 1.00000001e-300, 100000000e-300; 1e-308 1.00000001e-300 100000000e-300 diff --git a/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result b/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result index 6ab94a1b10b..468c4ade35f 100644 --- a/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result +++ b/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result @@ -53,13 +53,13 @@ if(1, 1.1, 1.2) if(0, 1.1, 1.2) if(0.1, 1.1, 1.2) if(0, 1, 1.1) if(0, NULL, 1.2) show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `if(1, 1.1, 1.2)` decimal(2,1) NOT NULL DEFAULT '0.0', - `if(0, 1.1, 1.2)` decimal(2,1) NOT NULL DEFAULT '0.0', - `if(0.1, 1.1, 1.2)` decimal(2,1) NOT NULL DEFAULT '0.0', - `if(0, 1, 1.1)` decimal(2,1) NOT NULL DEFAULT '0.0', + `if(1, 1.1, 1.2)` decimal(2,1) NOT NULL, + `if(0, 1.1, 1.2)` decimal(2,1) NOT NULL, + `if(0.1, 1.1, 1.2)` decimal(2,1) NOT NULL, + `if(0, 1, 1.1)` decimal(2,1) NOT NULL, `if(0, NULL, 1.2)` decimal(2,1) DEFAULT NULL, - `if(1, 0.22e1, 1.1)` double NOT NULL DEFAULT '0', - `if(1E0, 1.1, 1.2)` decimal(2,1) NOT NULL DEFAULT '0.0' + `if(1, 0.22e1, 1.1)` double NOT NULL, + `if(1E0, 1.1, 1.2)` decimal(2,1) NOT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 drop table t1; create table t1 select nullif(1.1, 1.1), nullif(1.1, 1.2), nullif(1.1, 0.11e1), nullif(1.0, 1), nullif(1, 1.0), nullif(1, 1.1); @@ -175,10 +175,10 @@ create table t1 select round(15.4,-1), truncate(-5678.123451,-3), abs(-1.1), -(- show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `round(15.4,-1)` decimal(3,0) NOT NULL DEFAULT '0', - `truncate(-5678.123451,-3)` decimal(4,0) NOT NULL DEFAULT '0', - `abs(-1.1)` decimal(3,1) NOT NULL DEFAULT '0.0', - `-(-1.1)` decimal(2,1) NOT NULL DEFAULT '0.0' + `round(15.4,-1)` decimal(3,0) NOT NULL, + `truncate(-5678.123451,-3)` decimal(4,0) NOT NULL, + `abs(-1.1)` decimal(3,1) NOT NULL, + `-(-1.1)` decimal(2,1) NOT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 drop table t1; set session sql_mode='traditional'; @@ -772,7 +772,7 @@ create table t1 as select 0.5; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `0.5` decimal(2,1) NOT NULL DEFAULT '0.0' + `0.5` decimal(2,1) NOT NULL ) ENGINE=TokuDB DEFAULT CHARSET=latin1 drop table t1; select round(1.5),round(2.5); @@ -1510,7 +1510,7 @@ Warnings: Note 1265 Data truncated for column 'f1' at row 1 DESC t1; Field Type Null Key Default Extra -f1 decimal(31,30) NO 0.000000000000000000000000000000 +f1 decimal(31,30) NO NULL SELECT f1 FROM t1; f1 0.123456789012345678901234567890 @@ -1520,7 +1520,7 @@ Warnings: Warning 1264 Out of range value for column 'f1' at row 1 DESC t1; Field Type Null Key Default Extra -f1 decimal(65,30) NO 0.000000000000000000000000000000 +f1 decimal(65,30) NO NULL SELECT f1 FROM t1; f1 99999999999999999999999999999999999.999999999999999999999999999999 @@ -1624,7 +1624,7 @@ Warnings: Note 1265 Data truncated for column 'my_col' at row 1 DESCRIBE t1; Field Type Null Key Default Extra -my_col decimal(30,30) NO 0.000000000000000000000000000000 +my_col decimal(30,30) NO NULL SELECT my_col FROM t1; my_col 0.123456789123456789123456789123 @@ -1634,7 +1634,7 @@ Warnings: Note 1265 Data truncated for column 'my_col' at row 1 DESCRIBE t1; Field Type Null Key Default Extra -my_col decimal(65,30) NO 0.000000000000000000000000000000 +my_col decimal(65,30) NO NULL SELECT my_col FROM t1; my_col 1.123456789123456789123456789123 @@ -1644,7 +1644,7 @@ Warnings: Note 1265 Data truncated for column 'my_col' at row 1 DESCRIBE t1; Field Type Null Key Default Extra -my_col decimal(65,30) NO 0.000000000000000000000000000000 +my_col decimal(65,30) NO NULL SELECT my_col FROM t1; my_col 0.123456789123456789123456789123 @@ -1680,7 +1680,7 @@ Warnings: Warning 1264 Out of range value for column 'c1' at row 1 DESC t1; Field Type Null Key Default Extra -c1 decimal(65,0) NO 0 +c1 decimal(65,0) NO NULL SELECT * FROM t1; c1 99999999999999999999999999999999999999999999999999999999999999999 @@ -1692,7 +1692,7 @@ Warnings: Warning 1264 Out of range value for column 'c1' at row 1 DESC t1; Field Type Null Key Default Extra -c1 decimal(65,0) NO 0 +c1 decimal(65,0) NO NULL SELECT * FROM t1; c1 99999999999999999999999999999999999999999999999999999999999999999 @@ -1704,7 +1704,7 @@ Warnings: Warning 1264 Out of range value for column 'c1' at row 1 DESC t1; Field Type Null Key Default Extra -c1 decimal(65,0) NO 0 +c1 decimal(65,0) NO NULL SELECT * FROM t1; c1 99999999999999999999999999999999999999999999999999999999999999999 @@ -1716,7 +1716,7 @@ Warnings: Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated. DESC t1; Field Type Null Key Default Extra -c1 decimal(65,0) NO 0 +c1 decimal(65,0) NO NULL SELECT * FROM t1; c1 99999999999999999999999999999999999999999999999999999999999999999 @@ -1728,7 +1728,7 @@ Warnings: Warning 1264 Out of range value for column 'c1' at row 1 DESC t1; Field Type Null Key Default Extra -c1 decimal(65,30) NO 0.000000000000000000000000000000 +c1 decimal(65,30) NO NULL SELECT * FROM t1; c1 99999999999999999999999999999999999.999999999999999999999999999999 @@ -1738,7 +1738,7 @@ CREATE TABLE t1 SELECT AS c1; DESC t1; Field Type Null Key Default Extra -c1 decimal(31,30) NO 0.000000000000000000000000000000 +c1 decimal(31,30) NO NULL SELECT * FROM t1; c1 1.100000000000000000000000000000 @@ -1748,7 +1748,7 @@ CREATE TABLE t1 SELECT AS c1; DESC t1; Field Type Null Key Default Extra -c1 decimal(31,30) NO 0.000000000000000000000000000000 +c1 decimal(31,30) NO NULL SELECT * FROM t1; c1 1.100000000000000000000000000000 @@ -1760,7 +1760,7 @@ Warnings: Note 1265 Data truncated for column 'c1' at row 1 DESC t1; Field Type Null Key Default Extra -c1 decimal(30,30) NO 0.000000000000000000000000000000 +c1 decimal(30,30) NO NULL SELECT * FROM t1; c1 0.100000000000000000000000000000 @@ -1772,7 +1772,7 @@ Warnings: Warning 1264 Out of range value for column 'c1' at row 1 DESC t1; Field Type Null Key Default Extra -c1 decimal(65,30) NO 0.000000000000000000000000000000 +c1 decimal(65,30) NO NULL SELECT * FROM t1; c1 99999999999999999999999999999999999.999999999999999999999999999999 @@ -1784,7 +1784,7 @@ Warnings: Warning 1264 Out of range value for column 'c1' at row 1 DESC t1; Field Type Null Key Default Extra -c1 decimal(65,1) NO 0.0 +c1 decimal(65,1) NO NULL SELECT * FROM t1; c1 9999999999999999999999999999999999999999999999999999999999999999.9 @@ -1796,7 +1796,7 @@ Warnings: Warning 1264 Out of range value for column 'c1' at row 1 DESC t1; Field Type Null Key Default Extra -c1 decimal(65,1) NO 0.0 +c1 decimal(65,1) NO NULL SELECT * FROM t1; c1 9999999999999999999999999999999999999999999999999999999999999999.9 @@ -1808,7 +1808,7 @@ Warnings: Note 1265 Data truncated for column 'c1' at row 1 DESC t1; Field Type Null Key Default Extra -c1 decimal(30,30) NO 0.000000000000000000000000000000 +c1 decimal(30,30) NO NULL SELECT * FROM t1; c1 0.123456789012345678901234567890 @@ -1818,7 +1818,7 @@ Warnings: Note 1265 Data truncated for column 'c1' at row 1 DESC t1; Field Type Null Key Default Extra -c1 decimal(33,30) NO 0.000000000000000000000000000000 +c1 decimal(33,30) NO NULL SELECT * FROM t1; c1 123.123456789012345678901234567890 @@ -1826,7 +1826,7 @@ DROP TABLE t1; CREATE TABLE t1 SELECT 1.1 + CAST(1 AS DECIMAL(65,30)) AS c1; DESC t1; Field Type Null Key Default Extra -c1 decimal(65,30) NO 0.000000000000000000000000000000 +c1 decimal(65,30) NO NULL SELECT * FROM t1; c1 2.100000000000000000000000000000 diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/ai_part.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/ai_part.result index 38338f7f823..6bfe78bbef8 100644 --- a/storage/tokudb/mysql-test/tokudb_alter_table/r/ai_part.result +++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/ai_part.result @@ -6,7 +6,7 @@ INSERT INTO foo VALUES (1,0),(2,0); SHOW CREATE TABLE foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 @@ -16,7 +16,7 @@ ALTER TABLE foo ADD KEY(b); SHOW CREATE TABLE foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, PRIMARY KEY (`a`), KEY `b` (`b`) diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_part.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_part.result index 075ccad6065..1c7ee865451 100644 --- a/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_part.result +++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_part.result @@ -5,7 +5,7 @@ CREATE TABLE foo (a INT, b INT, PRIMARY KEY (a)) PARTITION BY HASH(a) PARTITIONS SHOW CREATE TABLE foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 @@ -15,7 +15,7 @@ ALTER TABLE foo ADD COLUMN c INT; SHOW CREATE TABLE foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL, PRIMARY KEY (`a`) diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr3.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr3.result index 834ddfbd2d3..4c700489b7f 100644 --- a/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr3.result +++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr3.result @@ -10,7 +10,7 @@ alter table foo change a aa int; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `aa` int(11) NOT NULL DEFAULT '0', + `aa` int(11) NOT NULL, `b` bigint(20) DEFAULT NULL, `c` char(10) DEFAULT NULL, `d` varchar(10) DEFAULT NULL, @@ -32,7 +32,7 @@ alter table foo change b bb bigint; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `aa` int(11) NOT NULL DEFAULT '0', + `aa` int(11) NOT NULL, `bb` bigint(20) DEFAULT NULL, `c` char(10) DEFAULT NULL, `d` varchar(10) DEFAULT NULL, @@ -51,7 +51,7 @@ alter table foo change d dd varchar(10); show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `aa` int(11) NOT NULL DEFAULT '0', + `aa` int(11) NOT NULL, `bb` bigint(20) DEFAULT NULL, `c` char(10) DEFAULT NULL, `dd` varchar(10) DEFAULT NULL, diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter.result index 7ec5ee47865..f458aee8cd5 100644 --- a/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter.result +++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter.result @@ -58,7 +58,7 @@ foo CREATE TABLE `foo` ( `b` varchar(20) DEFAULT NULL, `c` int(11) DEFAULT NULL, `d` int(11) DEFAULT NULL, - `e` int(11) NOT NULL DEFAULT '0', + `e` int(11) NOT NULL, PRIMARY KEY (`e`), UNIQUE KEY `c` (`c`), KEY `d` (`d`), diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter2.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter2.result index 7e552fbbfa1..69c3da7ae97 100644 --- a/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter2.result +++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter2.result @@ -52,7 +52,7 @@ foo CREATE TABLE `foo` ( `cc` int(11), `dd` int(11) DEFAULT NULL, `ee` int(11) DEFAULT NULL, - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` varchar(20) DEFAULT NULL, `c` int(11) DEFAULT NULL, `d` int(11) DEFAULT NULL, @@ -70,7 +70,7 @@ foo_isam CREATE TABLE `foo_isam` ( `cc` int(11), `dd` int(11) DEFAULT NULL, `ee` int(11) DEFAULT NULL, - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` varchar(20) DEFAULT NULL, `c` int(11) DEFAULT NULL, `d` int(11) DEFAULT NULL, diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/dict_leak_3518.result b/storage/tokudb/mysql-test/tokudb_bugs/r/dict_leak_3518.result index ae80daae14b..0513bb7f3e5 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/dict_leak_3518.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/dict_leak_3518.result @@ -6,7 +6,7 @@ create table foo (a int, primary key (a)) engine=TokuDB; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 insert into foo values(1); @@ -18,7 +18,7 @@ create table foo (a int, primary key (a)) engine=TokuDB select * from bar; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 select * from foo; @@ -43,7 +43,7 @@ create table foo (a int, primary key (a)) engine=TokuDB select * from bar; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 select * from foo; @@ -65,7 +65,7 @@ create table foo (a int, primary key (a)) engine=TokuDB; show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 insert into foo values(1); diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store3.result b/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store3.result index 2b098d68705..08f157f5223 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store3.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store3.result @@ -7,7 +7,7 @@ alter table bar add index (a); show create table foo; Table Create Table foo CREATE TABLE `foo` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=TokuDB DEFAULT CHARSET=latin1 |