Skip to content

Commit 88c9602

Browse files
author
msvensson@neptunus.(none)
committed
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug10466
2 parents dcb4789 + 8aaad90 commit 88c9602

31 files changed

+66
-41
lines changed

‎mysql-test/include/ps_create.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ eval create table t9
3333
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
3434
c5 integer, c6 bigint, c7 float, c8 double,
3535
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
36-
c13 date, c14 datetime, c15 timestamp(14), c16 time,
36+
c13 date, c14 datetime, c15 timestamp, c16 time,
3737
c17 year, c18 tinyint, c19 bool, c20 char,
3838
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
3939
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,

‎mysql-test/r/alias.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ hdl_name varchar(30) default NULL,
2727
prov_hdl_nr int(11) NOT NULL default '0',
2828
auto_wirknetz varchar(50) default NULL,
2929
auto_billing varchar(50) default NULL,
30-
touch timestamp(14) NOT NULL,
30+
touch timestamp NOT NULL,
3131
kategorie varchar(50) default NULL,
3232
kundentyp varchar(20) NOT NULL default '',
3333
sammel_rech_msisdn varchar(30) NOT NULL default '',

‎mysql-test/r/func_date_add.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ visitor_id int(10) unsigned DEFAULT '0' NOT NULL,
44
group_id int(10) unsigned DEFAULT '0' NOT NULL,
55
hits int(10) unsigned DEFAULT '0' NOT NULL,
66
sessions int(10) unsigned DEFAULT '0' NOT NULL,
7-
ts timestamp(14),
7+
ts timestamp,
88
PRIMARY KEY (visitor_id,group_id)
99
)/*! engine=MyISAM */;
1010
INSERT INTO t1 VALUES (465931136,7,2,2,20000318160952);

‎mysql-test/r/func_str.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ category int(10) unsigned default NULL,
264264
program int(10) unsigned default NULL,
265265
bugdesc text,
266266
created datetime default NULL,
267-
modified timestamp(14) NOT NULL,
267+
modified timestamp NOT NULL,
268268
bugstatus int(10) unsigned default NULL,
269269
submitter int(10) unsigned default NULL
270270
) ENGINE=MyISAM;

‎mysql-test/r/func_time.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ extract(MONTH FROM "0000-00-00") extract(MONTH FROM d) extract(MONTH FROM dt) ex
465465
drop table t1;
466466
CREATE TABLE t1 ( start datetime default NULL);
467467
INSERT INTO t1 VALUES ('2002-10-21 00:00:00'),('2002-10-28 00:00:00'),('2002-11-04 00:00:00');
468-
CREATE TABLE t2 ( ctime1 timestamp(14) NOT NULL, ctime2 timestamp(14) NOT NULL);
468+
CREATE TABLE t2 ( ctime1 timestamp NOT NULL, ctime2 timestamp NOT NULL);
469469
INSERT INTO t2 VALUES (20021029165106,20021105164731);
470470
CREATE TABLE t3 (ctime1 char(19) NOT NULL, ctime2 char(19) NOT NULL);
471471
INSERT INTO t3 VALUES ("2002-10-29 16:51:06","2002-11-05 16:47:31");

‎mysql-test/r/group_by.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ bug_file_loc text,
117117
bug_severity enum('blocker','critical','major','normal','minor','trivial','enhancement') DEFAULT 'blocker' NOT NULL,
118118
bug_status enum('','NEW','ASSIGNED','REOPENED','RESOLVED','VERIFIED','CLOSED') DEFAULT 'NEW' NOT NULL,
119119
creation_ts datetime DEFAULT '0000-00-00 00:00:00' NOT NULL,
120-
delta_ts timestamp(14),
120+
delta_ts timestamp,
121121
short_desc mediumtext,
122122
long_desc mediumtext,
123123
op_sys enum('All','Windows 3.1','Windows 95','Windows 98','Windows NT','Windows 2000','Linux','other') DEFAULT 'All' NOT NULL,

‎mysql-test/r/innodb.result

+4-4
Original file line numberDiff line numberDiff line change
@@ -972,9 +972,9 @@ number bigint(20) NOT NULL default '0',
972972
cname char(15) NOT NULL default '',
973973
carrier_id smallint(6) NOT NULL default '0',
974974
privacy tinyint(4) NOT NULL default '0',
975-
last_mod_date timestamp(14) NOT NULL,
975+
last_mod_date timestamp NOT NULL,
976976
last_mod_id smallint(6) NOT NULL default '0',
977-
last_app_date timestamp(14) NOT NULL,
977+
last_app_date timestamp NOT NULL,
978978
last_app_id smallint(6) default '-1',
979979
version smallint(6) NOT NULL default '0',
980980
assigned_scps int(11) default '0',
@@ -991,9 +991,9 @@ number bigint(20) NOT NULL default '0',
991991
cname char(15) NOT NULL default '',
992992
carrier_id smallint(6) NOT NULL default '0',
993993
privacy tinyint(4) NOT NULL default '0',
994-
last_mod_date timestamp(14) NOT NULL,
994+
last_mod_date timestamp NOT NULL,
995995
last_mod_id smallint(6) NOT NULL default '0',
996-
last_app_date timestamp(14) NOT NULL,
996+
last_app_date timestamp NOT NULL,
997997
last_app_id smallint(6) default '-1',
998998
version smallint(6) NOT NULL default '0',
999999
assigned_scps int(11) default '0',

‎mysql-test/r/ps.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ create table t1
138138
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
139139
c5 integer, c6 bigint, c7 float, c8 double,
140140
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
141-
c13 date, c14 datetime, c15 timestamp(14), c16 time,
141+
c13 date, c14 datetime, c15 timestamp, c16 time,
142142
c17 year, c18 bit, c19 bool, c20 char,
143143
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
144144
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,

‎mysql-test/r/ps_1general.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ create table t9
1717
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
1818
c5 integer, c6 bigint, c7 float, c8 double,
1919
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
20-
c13 date, c14 datetime, c15 timestamp(14), c16 time,
20+
c13 date, c14 datetime, c15 timestamp, c16 time,
2121
c17 year, c18 tinyint, c19 bool, c20 char,
2222
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
2323
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,

‎mysql-test/r/ps_2myisam.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ create table t9
1010
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
1111
c5 integer, c6 bigint, c7 float, c8 double,
1212
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
13-
c13 date, c14 datetime, c15 timestamp(14), c16 time,
13+
c13 date, c14 datetime, c15 timestamp, c16 time,
1414
c17 year, c18 tinyint, c19 bool, c20 char,
1515
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
1616
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,

‎mysql-test/r/ps_3innodb.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ create table t9
1010
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
1111
c5 integer, c6 bigint, c7 float, c8 double,
1212
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
13-
c13 date, c14 datetime, c15 timestamp(14), c16 time,
13+
c13 date, c14 datetime, c15 timestamp, c16 time,
1414
c17 year, c18 tinyint, c19 bool, c20 char,
1515
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
1616
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,

‎mysql-test/r/ps_4heap.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ create table t9
1111
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
1212
c5 integer, c6 bigint, c7 float, c8 double,
1313
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
14-
c13 date, c14 datetime, c15 timestamp(14), c16 time,
14+
c13 date, c14 datetime, c15 timestamp, c16 time,
1515
c17 year, c18 tinyint, c19 bool, c20 char,
1616
c21 char(10), c22 varchar(30), c23 varchar(100), c24 varchar(100),
1717
c25 varchar(100), c26 varchar(100), c27 varchar(100), c28 varchar(100),

‎mysql-test/r/ps_5merge.result

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ create table t9
1212
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
1313
c5 integer, c6 bigint, c7 float, c8 double,
1414
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
15-
c13 date, c14 datetime, c15 timestamp(14), c16 time,
15+
c13 date, c14 datetime, c15 timestamp, c16 time,
1616
c17 year, c18 tinyint, c19 bool, c20 char,
1717
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
1818
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,
@@ -32,7 +32,7 @@ create table t9
3232
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
3333
c5 integer, c6 bigint, c7 float, c8 double,
3434
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
35-
c13 date, c14 datetime, c15 timestamp(14), c16 time,
35+
c13 date, c14 datetime, c15 timestamp, c16 time,
3636
c17 year, c18 tinyint, c19 bool, c20 char,
3737
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
3838
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,
@@ -52,7 +52,7 @@ create table t9
5252
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
5353
c5 integer, c6 bigint, c7 float, c8 double,
5454
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
55-
c13 date, c14 datetime, c15 timestamp(14), c16 time,
55+
c13 date, c14 datetime, c15 timestamp, c16 time,
5656
c17 year, c18 tinyint, c19 bool, c20 char,
5757
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
5858
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,
@@ -3064,7 +3064,7 @@ create table t9
30643064
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
30653065
c5 integer, c6 bigint, c7 float, c8 double,
30663066
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
3067-
c13 date, c14 datetime, c15 timestamp(14), c16 time,
3067+
c13 date, c14 datetime, c15 timestamp, c16 time,
30683068
c17 year, c18 tinyint, c19 bool, c20 char,
30693069
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
30703070
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,

‎mysql-test/r/ps_6bdb.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ create table t9
1010
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
1111
c5 integer, c6 bigint, c7 float, c8 double,
1212
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
13-
c13 date, c14 datetime, c15 timestamp(14), c16 time,
13+
c13 date, c14 datetime, c15 timestamp, c16 time,
1414
c17 year, c18 tinyint, c19 bool, c20 char,
1515
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
1616
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,

‎mysql-test/r/ps_7ndb.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ create table t9
1010
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
1111
c5 integer, c6 bigint, c7 float, c8 double,
1212
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
13-
c13 date, c14 datetime, c15 timestamp(14), c16 time,
13+
c13 date, c14 datetime, c15 timestamp, c16 time,
1414
c17 year, c18 tinyint, c19 bool, c20 char,
1515
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
1616
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,

‎mysql-test/r/select.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -2073,7 +2073,7 @@ INSERT INTO t1 (pseudo) VALUES ('test1');
20732073
SELECT 1 as rnd1 from t1 where rand() > 2;
20742074
rnd1
20752075
DROP TABLE t1;
2076-
CREATE TABLE t1 (gvid int(10) unsigned default NULL, hmid int(10) unsigned default NULL, volid int(10) unsigned default NULL, mmid int(10) unsigned default NULL, hdid int(10) unsigned default NULL, fsid int(10) unsigned default NULL, ctid int(10) unsigned default NULL, dtid int(10) unsigned default NULL, cost int(10) unsigned default NULL, performance int(10) unsigned default NULL, serialnumber bigint(20) unsigned default NULL, monitored tinyint(3) unsigned default '1', removed tinyint(3) unsigned default '0', target tinyint(3) unsigned default '0', dt_modified timestamp(14) NOT NULL, name varchar(255) binary default NULL, description varchar(255) default NULL, UNIQUE KEY hmid (hmid,volid)) ENGINE=MyISAM;
2076+
CREATE TABLE t1 (gvid int(10) unsigned default NULL, hmid int(10) unsigned default NULL, volid int(10) unsigned default NULL, mmid int(10) unsigned default NULL, hdid int(10) unsigned default NULL, fsid int(10) unsigned default NULL, ctid int(10) unsigned default NULL, dtid int(10) unsigned default NULL, cost int(10) unsigned default NULL, performance int(10) unsigned default NULL, serialnumber bigint(20) unsigned default NULL, monitored tinyint(3) unsigned default '1', removed tinyint(3) unsigned default '0', target tinyint(3) unsigned default '0', dt_modified timestamp NOT NULL, name varchar(255) binary default NULL, description varchar(255) default NULL, UNIQUE KEY hmid (hmid,volid)) ENGINE=MyISAM;
20772077
INSERT INTO t1 VALUES (200001,2,1,1,100,1,1,1,0,0,0,1,0,1,20020425060057,'\\\\ARKIVIO-TESTPDC\\E$',''),(200002,2,2,1,101,1,1,1,0,0,0,1,0,1,20020425060057,'\\\\ARKIVIO-TESTPDC\\C$',''),(200003,1,3,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,1,20020425060427,'c:',NULL);
20782078
CREATE TABLE t2 ( hmid int(10) unsigned default NULL, volid int(10) unsigned default NULL, sampletid smallint(5) unsigned default NULL, sampletime datetime default NULL, samplevalue bigint(20) unsigned default NULL, KEY idx1 (hmid,volid,sampletid,sampletime)) ENGINE=MyISAM;
20792079
INSERT INTO t2 VALUES (1,3,10,'2002-06-01 08:00:00',35),(1,3,1010,'2002-06-01 12:00:01',35);

‎mysql-test/r/type_timestamp.result

+8
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,14 @@ drop table t1;
9999
create table t1 (t2 timestamp(2), t4 timestamp(4), t6 timestamp(6),
100100
t8 timestamp(8), t10 timestamp(10), t12 timestamp(12),
101101
t14 timestamp(14));
102+
Warnings:
103+
Warning 1287 'TIMESTAMP(2)' is deprecated; use 'TIMESTAMP' instead
104+
Warning 1287 'TIMESTAMP(4)' is deprecated; use 'TIMESTAMP' instead
105+
Warning 1287 'TIMESTAMP(6)' is deprecated; use 'TIMESTAMP' instead
106+
Warning 1287 'TIMESTAMP(8)' is deprecated; use 'TIMESTAMP' instead
107+
Warning 1287 'TIMESTAMP(10)' is deprecated; use 'TIMESTAMP' instead
108+
Warning 1287 'TIMESTAMP(12)' is deprecated; use 'TIMESTAMP' instead
109+
Warning 1287 'TIMESTAMP(14)' is deprecated; use 'TIMESTAMP' instead
102110
insert t1 values (0,0,0,0,0,0,0),
103111
("1997-12-31 23:47:59", "1997-12-31 23:47:59", "1997-12-31 23:47:59",
104112
"1997-12-31 23:47:59", "1997-12-31 23:47:59", "1997-12-31 23:47:59",

‎mysql-test/r/update.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ ushows int(10) unsigned DEFAULT '0' NOT NULL,
5858
clicks int(10) unsigned DEFAULT '0' NOT NULL,
5959
iclicks int(10) unsigned DEFAULT '0' NOT NULL,
6060
uclicks int(10) unsigned DEFAULT '0' NOT NULL,
61-
ts timestamp(14),
61+
ts timestamp,
6262
PRIMARY KEY (place_id,ts)
6363
);
6464
INSERT INTO t1 (place_id,shows,ishows,ushows,clicks,iclicks,uclicks,ts)
@@ -75,7 +75,7 @@ client varchar(255) NOT NULL default '',
7575
replyto varchar(255) NOT NULL default '',
7676
subject varchar(100) NOT NULL default '',
7777
timestamp int(10) unsigned NOT NULL default '0',
78-
tstamp timestamp(14) NOT NULL,
78+
tstamp timestamp NOT NULL,
7979
status int(3) NOT NULL default '0',
8080
type varchar(15) NOT NULL default '',
8181
assignment int(10) unsigned NOT NULL default '0',

‎mysql-test/t/alias.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ CREATE TABLE t1 (
3030
prov_hdl_nr int(11) NOT NULL default '0',
3131
auto_wirknetz varchar(50) default NULL,
3232
auto_billing varchar(50) default NULL,
33-
touch timestamp(14) NOT NULL,
33+
touch timestamp NOT NULL,
3434
kategorie varchar(50) default NULL,
3535
kundentyp varchar(20) NOT NULL default '',
3636
sammel_rech_msisdn varchar(30) NOT NULL default '',

‎mysql-test/t/func_date_add.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CREATE TABLE t1 (
1111
group_id int(10) unsigned DEFAULT '0' NOT NULL,
1212
hits int(10) unsigned DEFAULT '0' NOT NULL,
1313
sessions int(10) unsigned DEFAULT '0' NOT NULL,
14-
ts timestamp(14),
14+
ts timestamp,
1515
PRIMARY KEY (visitor_id,group_id)
1616
)/*! engine=MyISAM */;
1717
INSERT INTO t1 VALUES (465931136,7,2,2,20000318160952);

‎mysql-test/t/func_str.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ CREATE TABLE t1 (
128128
program int(10) unsigned default NULL,
129129
bugdesc text,
130130
created datetime default NULL,
131-
modified timestamp(14) NOT NULL,
131+
modified timestamp NOT NULL,
132132
bugstatus int(10) unsigned default NULL,
133133
submitter int(10) unsigned default NULL
134134
) ENGINE=MyISAM;

‎mysql-test/t/func_time.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ drop table t1;
211211

212212
CREATE TABLE t1 ( start datetime default NULL);
213213
INSERT INTO t1 VALUES ('2002-10-21 00:00:00'),('2002-10-28 00:00:00'),('2002-11-04 00:00:00');
214-
CREATE TABLE t2 ( ctime1 timestamp(14) NOT NULL, ctime2 timestamp(14) NOT NULL);
214+
CREATE TABLE t2 ( ctime1 timestamp NOT NULL, ctime2 timestamp NOT NULL);
215215
INSERT INTO t2 VALUES (20021029165106,20021105164731);
216216
CREATE TABLE t3 (ctime1 char(19) NOT NULL, ctime2 char(19) NOT NULL);
217217
INSERT INTO t3 VALUES ("2002-10-29 16:51:06","2002-11-05 16:47:31");

‎mysql-test/t/group_by.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ CREATE TABLE t1 (
135135
bug_severity enum('blocker','critical','major','normal','minor','trivial','enhancement') DEFAULT 'blocker' NOT NULL,
136136
bug_status enum('','NEW','ASSIGNED','REOPENED','RESOLVED','VERIFIED','CLOSED') DEFAULT 'NEW' NOT NULL,
137137
creation_ts datetime DEFAULT '0000-00-00 00:00:00' NOT NULL,
138-
delta_ts timestamp(14),
138+
delta_ts timestamp,
139139
short_desc mediumtext,
140140
long_desc mediumtext,
141141
op_sys enum('All','Windows 3.1','Windows 95','Windows 98','Windows NT','Windows 2000','Linux','other') DEFAULT 'All' NOT NULL,

‎mysql-test/t/innodb.test

+4-4
Original file line numberDiff line numberDiff line change
@@ -660,9 +660,9 @@ CREATE TABLE t1 (
660660
cname char(15) NOT NULL default '',
661661
carrier_id smallint(6) NOT NULL default '0',
662662
privacy tinyint(4) NOT NULL default '0',
663-
last_mod_date timestamp(14) NOT NULL,
663+
last_mod_date timestamp NOT NULL,
664664
last_mod_id smallint(6) NOT NULL default '0',
665-
last_app_date timestamp(14) NOT NULL,
665+
last_app_date timestamp NOT NULL,
666666
last_app_id smallint(6) default '-1',
667667
version smallint(6) NOT NULL default '0',
668668
assigned_scps int(11) default '0',
@@ -679,9 +679,9 @@ CREATE TABLE t2 (
679679
cname char(15) NOT NULL default '',
680680
carrier_id smallint(6) NOT NULL default '0',
681681
privacy tinyint(4) NOT NULL default '0',
682-
last_mod_date timestamp(14) NOT NULL,
682+
last_mod_date timestamp NOT NULL,
683683
last_mod_id smallint(6) NOT NULL default '0',
684-
last_app_date timestamp(14) NOT NULL,
684+
last_app_date timestamp NOT NULL,
685685
last_app_id smallint(6) default '-1',
686686
version smallint(6) NOT NULL default '0',
687687
assigned_scps int(11) default '0',

‎mysql-test/t/ps.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ create table t1
149149
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
150150
c5 integer, c6 bigint, c7 float, c8 double,
151151
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
152-
c13 date, c14 datetime, c15 timestamp(14), c16 time,
152+
c13 date, c14 datetime, c15 timestamp, c16 time,
153153
c17 year, c18 bit, c19 bool, c20 char,
154154
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
155155
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,

‎mysql-test/t/ps_4heap.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ eval create table t9
3131
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
3232
c5 integer, c6 bigint, c7 float, c8 double,
3333
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
34-
c13 date, c14 datetime, c15 timestamp(14), c16 time,
34+
c13 date, c14 datetime, c15 timestamp, c16 time,
3535
c17 year, c18 tinyint, c19 bool, c20 char,
3636
c21 char(10), c22 varchar(30), c23 varchar(100), c24 varchar(100),
3737
c25 varchar(100), c26 varchar(100), c27 varchar(100), c28 varchar(100),

‎mysql-test/t/ps_5merge.test

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ create table t9
3131
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
3232
c5 integer, c6 bigint, c7 float, c8 double,
3333
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
34-
c13 date, c14 datetime, c15 timestamp(14), c16 time,
34+
c13 date, c14 datetime, c15 timestamp, c16 time,
3535
c17 year, c18 tinyint, c19 bool, c20 char,
3636
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
3737
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,
@@ -62,7 +62,7 @@ create table t9
6262
c1 tinyint, c2 smallint, c3 mediumint, c4 int,
6363
c5 integer, c6 bigint, c7 float, c8 double,
6464
c9 double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),
65-
c13 date, c14 datetime, c15 timestamp(14), c16 time,
65+
c13 date, c14 datetime, c15 timestamp, c16 time,
6666
c17 year, c18 tinyint, c19 bool, c20 char,
6767
c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
6868
c25 blob, c26 text, c27 mediumblob, c28 mediumtext,

‎mysql-test/t/select.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -1789,7 +1789,7 @@ DROP TABLE t1;
17891789
# Test of bug with SUM(CASE...)
17901790
#
17911791

1792-
CREATE TABLE t1 (gvid int(10) unsigned default NULL, hmid int(10) unsigned default NULL, volid int(10) unsigned default NULL, mmid int(10) unsigned default NULL, hdid int(10) unsigned default NULL, fsid int(10) unsigned default NULL, ctid int(10) unsigned default NULL, dtid int(10) unsigned default NULL, cost int(10) unsigned default NULL, performance int(10) unsigned default NULL, serialnumber bigint(20) unsigned default NULL, monitored tinyint(3) unsigned default '1', removed tinyint(3) unsigned default '0', target tinyint(3) unsigned default '0', dt_modified timestamp(14) NOT NULL, name varchar(255) binary default NULL, description varchar(255) default NULL, UNIQUE KEY hmid (hmid,volid)) ENGINE=MyISAM;
1792+
CREATE TABLE t1 (gvid int(10) unsigned default NULL, hmid int(10) unsigned default NULL, volid int(10) unsigned default NULL, mmid int(10) unsigned default NULL, hdid int(10) unsigned default NULL, fsid int(10) unsigned default NULL, ctid int(10) unsigned default NULL, dtid int(10) unsigned default NULL, cost int(10) unsigned default NULL, performance int(10) unsigned default NULL, serialnumber bigint(20) unsigned default NULL, monitored tinyint(3) unsigned default '1', removed tinyint(3) unsigned default '0', target tinyint(3) unsigned default '0', dt_modified timestamp NOT NULL, name varchar(255) binary default NULL, description varchar(255) default NULL, UNIQUE KEY hmid (hmid,volid)) ENGINE=MyISAM;
17931793
INSERT INTO t1 VALUES (200001,2,1,1,100,1,1,1,0,0,0,1,0,1,20020425060057,'\\\\ARKIVIO-TESTPDC\\E$',''),(200002,2,2,1,101,1,1,1,0,0,0,1,0,1,20020425060057,'\\\\ARKIVIO-TESTPDC\\C$',''),(200003,1,3,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,1,20020425060427,'c:',NULL);
17941794
CREATE TABLE t2 ( hmid int(10) unsigned default NULL, volid int(10) unsigned default NULL, sampletid smallint(5) unsigned default NULL, sampletime datetime default NULL, samplevalue bigint(20) unsigned default NULL, KEY idx1 (hmid,volid,sampletid,sampletime)) ENGINE=MyISAM;
17951795
INSERT INTO t2 VALUES (1,3,10,'2002-06-01 08:00:00',35),(1,3,1010,'2002-06-01 12:00:01',35);

0 commit comments

Comments
 (0)