Commit d2b52d19 authored by unknown's avatar unknown
Browse files

bug#10466: Datatype "timestamp" displays "YYYYMMDDHHMMSS" irrespective of display sizes. 

 - Print warning that says display width is not supported for datatype TIMESTAMP, if user tries to create a TIMESTAMP column with display width.
 - Use display width for TIMESTAMP only in type_timestamp test to make sure warning is displayed correctly.


mysql-test/include/ps_create.inc:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/alias.result:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/func_date_add.result:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/func_str.result:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/func_time.result:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/group_by.result:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/innodb.result:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps.result:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_1general.result:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_2myisam.result:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_3innodb.result:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_4heap.result:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_5merge.result:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_6bdb.result:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/ps_7ndb.result:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/select.result:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/r/type_timestamp.result:
  When display width is used for a TIMESTAMP column a warning is printed that the display width will be ignored.
mysql-test/r/update.result:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/alias.test:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/func_date_add.test:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/func_str.test:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/func_time.test:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/group_by.test:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/innodb.test:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/ps.test:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/ps_4heap.test:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/ps_5merge.test:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/select.test:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
mysql-test/t/update.test:
  Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp test.
sql/share/errmsg.txt:
  Correct swedish error message
sql/sql_parse.cc:
  Print warning if datatype is TIMESTAMP and display width is used.
parent d340c0f5

mysql-test/include/ps_create.inc

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ eval create table t9 
  c1  tinyint, c2  smallint, c3  mediumint, c4  int,

  c5  integer, c6  bigint, c7  float, c8  double,

  c9  double precision, c10 real, c11 decimal(7, 4), c12 numeric(8, 4),

  c13 date, c14 datetime, c15 timestamp(14), c16 time,

  c13 date, c14 datetime, c15 timestamp, c16 time,

  c17 year, c18 tinyint, c19 bool, c20 char,

  c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,

  c25 blob, c26 text, c27 mediumblob, c28 mediumtext,

mysql-test/r/alias.result

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ hdl_name varchar(30) default NULL, 
prov_hdl_nr int(11) NOT NULL default '0',

auto_wirknetz varchar(50) default NULL,

auto_billing varchar(50) default NULL,

touch timestamp(14) NOT NULL,

touch timestamp NOT NULL,

kategorie varchar(50) default NULL,

kundentyp varchar(20) NOT NULL default '',

sammel_rech_msisdn varchar(30) NOT NULL default '',

mysql-test/r/func_date_add.result

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ visitor_id int(10) unsigned DEFAULT '0' NOT NULL, 
group_id int(10) unsigned DEFAULT '0' NOT NULL,

hits int(10) unsigned DEFAULT '0' NOT NULL,

sessions int(10) unsigned DEFAULT '0' NOT NULL,

ts timestamp(14),

ts timestamp,

PRIMARY KEY (visitor_id,group_id)

)/*! engine=MyISAM */;

INSERT INTO t1 VALUES (465931136,7,2,2,20000318160952);

mysql-test/r/func_str.result

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ category int(10) unsigned default NULL, 
program int(10) unsigned default NULL,

bugdesc text,

created datetime default NULL,

modified timestamp(14) NOT NULL,

modified timestamp NOT NULL,

bugstatus int(10) unsigned default NULL,

submitter int(10) unsigned default NULL

) ENGINE=MyISAM;

mysql-test/r/func_time.result

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ extract(MONTH FROM "0000-00-00") extract(MONTH FROM d) extract(MONTH FROM dt) ex 
drop table t1;

CREATE TABLE t1 ( start datetime default NULL);

INSERT INTO t1 VALUES ('2002-10-21 00:00:00'),('2002-10-28 00:00:00'),('2002-11-04 00:00:00');

CREATE TABLE t2 ( ctime1 timestamp(14) NOT NULL, ctime2 timestamp(14) NOT NULL);

CREATE TABLE t2 ( ctime1 timestamp NOT NULL, ctime2 timestamp NOT NULL);

INSERT INTO t2 VALUES (20021029165106,20021105164731);

CREATE TABLE t3 (ctime1 char(19) NOT NULL, ctime2 char(19) NOT NULL);

INSERT INTO t3 VALUES ("2002-10-29 16:51:06","2002-11-05 16:47:31");