MySQL Lists: internals: bk commit into 5.0 tree (msvensson:1.1971) BUG#10466

List:	Internals	« Previous Message Next Message »
From:	msvensson	Date:	June 16 2005 3:34pm
Subject:	bk commit into 5.0 tree (msvensson:1.1971) BUG#10466
View as plain text
Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1971 05/06/16 15:33:57 msvensson@neptunus.(none) +31 -0
  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.

  sql/sql_parse.cc
    1.453 05/06/16 15:33:53 msvensson@neptunus.(none) +11 -0
    Print warning if datatype is TIMESTAMP and display width is used.

  sql/share/errmsg.txt
    1.33 05/06/16 15:33:53 msvensson@neptunus.(none) +3 -1
    Correct swedish error message
    Add error message for warning displayed when display width of TIMESTAMP datatype is
ignored.

  mysql-test/t/update.test
    1.20 05/06/16 15:33:53 msvensson@neptunus.(none) +2 -2
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/t/select.test
    1.49 05/06/16 15:33:53 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/t/ps_5merge.test
    1.5 05/06/16 15:33:53 msvensson@neptunus.(none) +2 -2
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/t/ps_4heap.test
    1.6 05/06/16 15:33:53 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/t/ps.test
    1.41 05/06/16 15:33:53 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/t/innodb.test
    1.94 05/06/16 15:33:53 msvensson@neptunus.(none) +4 -4
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/t/group_by.test
    1.37 05/06/16 15:33:53 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/t/func_time.test
    1.34 05/06/16 15:33:52 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/t/func_str.test
    1.73 05/06/16 15:33:52 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/t/func_date_add.test
    1.6 05/06/16 15:33:52 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/t/alias.test
    1.7 05/06/16 15:33:52 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/r/update.result
    1.23 05/06/16 15:33:52 msvensson@neptunus.(none) +2 -2
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/r/type_timestamp.result
    1.28 05/06/16 15:33:52 msvensson@neptunus.(none) +8 -0
    When display width is used for a TIMESTAMP column a warning is printed that the
display width will be ignored.

  mysql-test/r/select.result
    1.65 05/06/16 15:33:52 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/r/ps_7ndb.result
    1.30 05/06/16 15:33:52 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/r/ps_6bdb.result
    1.30 05/06/16 15:33:52 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/r/ps_5merge.result
    1.28 05/06/16 15:33:52 msvensson@neptunus.(none) +4 -4
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/r/ps_4heap.result
    1.27 05/06/16 15:33:52 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/r/ps_3innodb.result
    1.31 05/06/16 15:33:52 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/r/ps_2myisam.result
    1.28 05/06/16 15:33:52 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/r/ps_1general.result
    1.42 05/06/16 15:33:52 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/r/ps.result
    1.42 05/06/16 15:33:52 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/r/innodb.result
    1.118 05/06/16 15:33:52 msvensson@neptunus.(none) +4 -4
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/r/group_by.result
    1.51 05/06/16 15:33:52 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/r/func_time.result
    1.41 05/06/16 15:33:52 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/r/func_str.result
    1.99 05/06/16 15:33:52 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/r/func_date_add.result
    1.7 05/06/16 15:33:52 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/r/alias.result
    1.8 05/06/16 15:33:52 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

  mysql-test/include/ps_create.inc
    1.5 05/06/16 15:33:52 msvensson@neptunus.(none) +1 -1
    Reove all uses of display width in for TIMESTAMP columns, except in the type_timestamp
test.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug10713

--- 1.452/sql/sql_parse.cc	2005-06-08 23:11:23 +02:00
+++ 1.453/sql/sql_parse.cc	2005-06-16 15:33:53 +02:00
@@ -5458,6 +5458,17 @@
     DBUG_RETURN(1);
   }
 
+  if (type == FIELD_TYPE_TIMESTAMP && length)
+  {
+    /* Display widths are no longer supported for TIMSTAMP as of MySQL 4.1.
+       In other words, for declarations such as TIMESTAMP(2), TIMESTAMP(4),
+       and so on, the display width is ignored.
+    */
+    push_warning_printf(thd,MYSQL_ERROR::WARN_LEVEL_WARN,
+                 ER_WARN_INVALID_TIMESTAMP_WIDTH,
+                 ER(ER_WARN_INVALID_TIMESTAMP_WIDTH), field_name);
+  }
+
   if (!(new_field= new_create_field(thd, field_name, type, length, decimals,
 		type_modifier, default_value, on_update_value,
 		comment, change, interval_list, cs, uint_geom_type)))

--- 1.32/sql/share/errmsg.txt	2005-06-07 12:53:03 +02:00
+++ 1.33/sql/share/errmsg.txt	2005-06-16 15:33:53 +02:00
@@ -5021,7 +5021,7 @@
 	por "A tabela destino %-.100s do %s n�o � atualiz�vel"
 	rus "������� %-.100s � %s �� ����� ���������"
 	spa "La tabla destino %-.100s del %s no es actualizable"
-	swe "Tabel %-.100s anv�nd med '%s' �r inte uppdateringsbar"
+	swe "Tabell %-.100s anv�nd med '%s' �r inte uppdateringsbar"
 	ukr "������� %-.100s � %s �� ���� ������������"
 ER_FEATURE_DISABLED  
 	eng "The '%s' feature is disabled; you need MySQL built with '%s' to have it working"
@@ -5358,3 +5358,5 @@
 	eng "The statement (%d) has no open cursor."
 ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
         eng "Explicit or implicit commit is not allowed in stored function or trigger."
+ER_WARN_INVALID_TIMESTAMP_WIDTH
+	eng "Display width for TIMESTAMP are no longer supported. Display width ignored for
'%-64s'"

--- 1.4/mysql-test/include/ps_create.inc	2004-12-17 14:26:49 +01:00
+++ 1.5/mysql-test/include/ps_create.inc	2005-06-16 15:33:52 +02:00
@@ -33,7 +33,7 @@
   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,

--- 1.41/mysql-test/r/ps_1general.result	2005-06-07 15:37:56 +02:00
+++ 1.42/mysql-test/r/ps_1general.result	2005-06-16 15:33:52 +02:00
@@ -17,7 +17,7 @@
 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,

--- 1.27/mysql-test/r/ps_2myisam.result	2005-06-07 15:37:56 +02:00
+++ 1.28/mysql-test/r/ps_2myisam.result	2005-06-16 15:33:52 +02:00
@@ -10,7 +10,7 @@
 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,

--- 1.30/mysql-test/r/ps_3innodb.result	2005-06-07 15:37:56 +02:00
+++ 1.31/mysql-test/r/ps_3innodb.result	2005-06-16 15:33:52 +02:00
@@ -10,7 +10,7 @@
 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,

--- 1.26/mysql-test/r/ps_4heap.result	2005-06-07 15:37:56 +02:00
+++ 1.27/mysql-test/r/ps_4heap.result	2005-06-16 15:33:52 +02:00
@@ -11,7 +11,7 @@
 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 varchar(100), c24 varchar(100),
 c25 varchar(100), c26 varchar(100), c27 varchar(100), c28 varchar(100),

--- 1.27/mysql-test/r/ps_5merge.result	2005-06-07 15:37:56 +02:00
+++ 1.28/mysql-test/r/ps_5merge.result	2005-06-16 15:33:52 +02:00
@@ -12,7 +12,7 @@
 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,
@@ -32,7 +32,7 @@
 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,
@@ -52,7 +52,7 @@
 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,
@@ -3064,7 +3064,7 @@
 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,

--- 1.29/mysql-test/r/ps_6bdb.result	2005-06-10 02:50:03 +02:00
+++ 1.30/mysql-test/r/ps_6bdb.result	2005-06-16 15:33:52 +02:00
@@ -10,7 +10,7 @@
 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,

--- 1.5/mysql-test/t/ps_4heap.test	2004-12-17 14:26:50 +01:00
+++ 1.6/mysql-test/t/ps_4heap.test	2005-06-16 15:33:53 +02:00
@@ -31,7 +31,7 @@
   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 varchar(100), c24 varchar(100),
   c25 varchar(100), c26 varchar(100), c27 varchar(100), c28 varchar(100),

--- 1.4/mysql-test/t/ps_5merge.test	2004-12-17 14:26:50 +01:00
+++ 1.5/mysql-test/t/ps_5merge.test	2005-06-16 15:33:53 +02:00
@@ -31,7 +31,7 @@
   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,
@@ -62,7 +62,7 @@
   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,

--- 1.29/mysql-test/r/ps_7ndb.result	2005-06-09 18:01:45 +02:00
+++ 1.30/mysql-test/r/ps_7ndb.result	2005-06-16 15:33:52 +02:00
@@ -10,7 +10,7 @@
 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,

--- 1.7/mysql-test/r/alias.result	2004-05-05 13:49:51 +02:00
+++ 1.8/mysql-test/r/alias.result	2005-06-16 15:33:52 +02:00
@@ -27,7 +27,7 @@
 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 '',

--- 1.6/mysql-test/r/func_date_add.result	2003-12-10 05:30:15 +01:00
+++ 1.7/mysql-test/r/func_date_add.result	2005-06-16 15:33:52 +02:00
@@ -4,7 +4,7 @@
 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);

--- 1.40/mysql-test/r/func_time.result	2005-06-06 07:39:20 +02:00
+++ 1.41/mysql-test/r/func_time.result	2005-06-16 15:33:52 +02:00
@@ -465,7 +465,7 @@
 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");

--- 1.50/mysql-test/r/group_by.result	2005-06-07 12:07:34 +02:00
+++ 1.51/mysql-test/r/group_by.result	2005-06-16 15:33:52 +02:00
@@ -117,7 +117,7 @@
 bug_severity enum('blocker','critical','major','normal','minor','trivial','enhancement')
DEFAULT 'blocker' NOT NULL,
 bug_status enum('','NEW','ASSIGNED','REOPENED','RESOLVED','VERIFIED','CLOSED') DEFAULT
'NEW' NOT NULL,
 creation_ts datetime DEFAULT '0000-00-00 00:00:00' NOT NULL,
-delta_ts timestamp(14),
+delta_ts timestamp,
 short_desc mediumtext,
 long_desc mediumtext,
 op_sys enum('All','Windows 3.1','Windows 95','Windows 98','Windows NT','Windows
2000','Linux','other') DEFAULT 'All' NOT NULL,

--- 1.117/mysql-test/r/innodb.result	2005-06-07 11:32:21 +02:00
+++ 1.118/mysql-test/r/innodb.result	2005-06-16 15:33:52 +02:00
@@ -973,9 +973,9 @@
 cname char(15) NOT NULL default '',
 carrier_id smallint(6) NOT NULL default '0',
 privacy tinyint(4) NOT NULL default '0',
-last_mod_date timestamp(14) NOT NULL,
+last_mod_date timestamp NOT NULL,
 last_mod_id smallint(6) NOT NULL default '0',
-last_app_date timestamp(14) NOT NULL,
+last_app_date timestamp NOT NULL,
 last_app_id smallint(6) default '-1',
 version smallint(6) NOT NULL default '0',
 assigned_scps int(11) default '0',
@@ -992,9 +992,9 @@
 cname char(15) NOT NULL default '',
 carrier_id smallint(6) NOT NULL default '0',
 privacy tinyint(4) NOT NULL default '0',
-last_mod_date timestamp(14) NOT NULL,
+last_mod_date timestamp NOT NULL,
 last_mod_id smallint(6) NOT NULL default '0',
-last_app_date timestamp(14) NOT NULL,
+last_app_date timestamp NOT NULL,
 last_app_id smallint(6) default '-1',
 version smallint(6) NOT NULL default '0',
 assigned_scps int(11) default '0',

--- 1.64/mysql-test/r/select.result	2005-06-09 18:15:08 +02:00
+++ 1.65/mysql-test/r/select.result	2005-06-16 15:33:52 +02:00
@@ -2073,7 +2073,7 @@
 SELECT 1 as rnd1 from t1 where rand() > 2;
 rnd1
 DROP TABLE t1;
-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;
+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;
 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);
 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;
 INSERT INTO t2 VALUES (1,3,10,'2002-06-01 08:00:00',35),(1,3,1010,'2002-06-01
12:00:01',35);

--- 1.27/mysql-test/r/type_timestamp.result	2005-04-20 15:14:43 +02:00
+++ 1.28/mysql-test/r/type_timestamp.result	2005-06-16 15:33:52 +02:00
@@ -99,6 +99,14 @@
 create table t1 (t2 timestamp(2), t4 timestamp(4), t6 timestamp(6),
 t8 timestamp(8), t10 timestamp(10), t12 timestamp(12),
 t14 timestamp(14));
+Warnings:
+Warning	1423	Display width for TIMESTAMP are no longer supported. Display width ignored
for 't2'
+Warning	1423	Display width for TIMESTAMP are no longer supported. Display width ignored
for 't4'
+Warning	1423	Display width for TIMESTAMP are no longer supported. Display width ignored
for 't6'
+Warning	1423	Display width for TIMESTAMP are no longer supported. Display width ignored
for 't8'
+Warning	1423	Display width for TIMESTAMP are no longer supported. Display width ignored
for 't10'
+Warning	1423	Display width for TIMESTAMP are no longer supported. Display width ignored
for 't12'
+Warning	1423	Display width for TIMESTAMP are no longer supported. Display width ignored
for 't14'
 insert t1 values (0,0,0,0,0,0,0),
 ("1997-12-31 23:47:59", "1997-12-31 23:47:59", "1997-12-31 23:47:59",
 "1997-12-31 23:47:59", "1997-12-31 23:47:59", "1997-12-31 23:47:59",

--- 1.22/mysql-test/r/update.result	2005-04-18 03:21:40 +02:00
+++ 1.23/mysql-test/r/update.result	2005-06-16 15:33:52 +02:00
@@ -58,7 +58,7 @@
 clicks int(10) unsigned DEFAULT '0' NOT NULL,
 iclicks int(10) unsigned DEFAULT '0' NOT NULL,
 uclicks int(10) unsigned DEFAULT '0' NOT NULL,
-ts timestamp(14),
+ts timestamp,
 PRIMARY KEY (place_id,ts)
 );
 INSERT INTO t1 (place_id,shows,ishows,ushows,clicks,iclicks,uclicks,ts)
@@ -75,7 +75,7 @@
 replyto varchar(255) NOT NULL default '',
 subject varchar(100) NOT NULL default '',
 timestamp int(10) unsigned NOT NULL default '0',
-tstamp timestamp(14) NOT NULL,
+tstamp timestamp NOT NULL,
 status int(3) NOT NULL default '0',
 type varchar(15) NOT NULL default '',
 assignment int(10) unsigned NOT NULL default '0',

--- 1.6/mysql-test/t/alias.test	2004-05-05 16:05:20 +02:00
+++ 1.7/mysql-test/t/alias.test	2005-06-16 15:33:52 +02:00
@@ -30,7 +30,7 @@
   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 '',

--- 1.5/mysql-test/t/func_date_add.test	2003-12-10 05:30:32 +01:00
+++ 1.6/mysql-test/t/func_date_add.test	2005-06-16 15:33:52 +02:00
@@ -11,7 +11,7 @@
   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);

--- 1.33/mysql-test/t/func_time.test	2005-06-06 07:39:20 +02:00
+++ 1.34/mysql-test/t/func_time.test	2005-06-16 15:33:52 +02:00
@@ -211,7 +211,7 @@
 
 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");

--- 1.36/mysql-test/t/group_by.test	2005-06-07 11:57:40 +02:00
+++ 1.37/mysql-test/t/group_by.test	2005-06-16 15:33:53 +02:00
@@ -134,7 +134,7 @@
   bug_severity
enum('blocker','critical','major','normal','minor','trivial','enhancement') DEFAULT
'blocker' NOT NULL,
   bug_status enum('','NEW','ASSIGNED','REOPENED','RESOLVED','VERIFIED','CLOSED') DEFAULT
'NEW' NOT NULL,
   creation_ts datetime DEFAULT '0000-00-00 00:00:00' NOT NULL,
-  delta_ts timestamp(14),
+  delta_ts timestamp,
   short_desc mediumtext,
   long_desc mediumtext,
   op_sys enum('All','Windows 3.1','Windows 95','Windows 98','Windows NT','Windows
2000','Linux','other') DEFAULT 'All' NOT NULL,

--- 1.93/mysql-test/t/innodb.test	2005-06-07 11:29:27 +02:00
+++ 1.94/mysql-test/t/innodb.test	2005-06-16 15:33:53 +02:00
@@ -661,9 +661,9 @@
   cname char(15) NOT NULL default '',
   carrier_id smallint(6) NOT NULL default '0',
   privacy tinyint(4) NOT NULL default '0',
-  last_mod_date timestamp(14) NOT NULL,
+  last_mod_date timestamp NOT NULL,
   last_mod_id smallint(6) NOT NULL default '0',
-  last_app_date timestamp(14) NOT NULL,
+  last_app_date timestamp NOT NULL,
   last_app_id smallint(6) default '-1',
   version smallint(6) NOT NULL default '0',
   assigned_scps int(11) default '0',
@@ -680,9 +680,9 @@
   cname char(15) NOT NULL default '',
   carrier_id smallint(6) NOT NULL default '0',
   privacy tinyint(4) NOT NULL default '0',
-  last_mod_date timestamp(14) NOT NULL,
+  last_mod_date timestamp NOT NULL,
   last_mod_id smallint(6) NOT NULL default '0',
-  last_app_date timestamp(14) NOT NULL,
+  last_app_date timestamp NOT NULL,
   last_app_id smallint(6) default '-1',
   version smallint(6) NOT NULL default '0',
   assigned_scps int(11) default '0',

--- 1.48/mysql-test/t/select.test	2005-06-09 18:15:47 +02:00
+++ 1.49/mysql-test/t/select.test	2005-06-16 15:33:53 +02:00
@@ -1789,7 +1789,7 @@
 # Test of bug with SUM(CASE...)
 #
 
-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;
+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;
 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);
 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;
 INSERT INTO t2 VALUES (1,3,10,'2002-06-01 08:00:00',35),(1,3,1010,'2002-06-01
12:00:01',35);

--- 1.19/mysql-test/t/update.test	2005-04-18 03:21:41 +02:00
+++ 1.20/mysql-test/t/update.test	2005-06-16 15:33:53 +02:00
@@ -31,7 +31,7 @@
  clicks int(10) unsigned DEFAULT '0' NOT NULL,
  iclicks int(10) unsigned DEFAULT '0' NOT NULL,
  uclicks int(10) unsigned DEFAULT '0' NOT NULL,
- ts timestamp(14),
+ ts timestamp,
  PRIMARY KEY (place_id,ts)
  );
 
@@ -52,7 +52,7 @@
   replyto varchar(255) NOT NULL default '',
   subject varchar(100) NOT NULL default '',
   timestamp int(10) unsigned NOT NULL default '0',
-  tstamp timestamp(14) NOT NULL,
+  tstamp timestamp NOT NULL,
   status int(3) NOT NULL default '0',
   type varchar(15) NOT NULL default '',
   assignment int(10) unsigned NOT NULL default '0',

--- 1.98/mysql-test/r/func_str.result	2005-06-02 00:33:20 +02:00
+++ 1.99/mysql-test/r/func_str.result	2005-06-16 15:33:52 +02:00
@@ -264,7 +264,7 @@
 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;

--- 1.72/mysql-test/t/func_str.test	2005-06-02 00:44:11 +02:00
+++ 1.73/mysql-test/t/func_str.test	2005-06-16 15:33:52 +02:00
@@ -128,7 +128,7 @@
   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;

--- 1.41/mysql-test/r/ps.result	2005-06-07 12:11:28 +02:00
+++ 1.42/mysql-test/r/ps.result	2005-06-16 15:33:52 +02:00
@@ -138,7 +138,7 @@
 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 bit, c19 bool, c20 char,
 c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
 c25 blob, c26 text, c27 mediumblob, c28 mediumtext,

--- 1.40/mysql-test/t/ps.test	2005-06-07 12:11:28 +02:00
+++ 1.41/mysql-test/t/ps.test	2005-06-16 15:33:53 +02:00
@@ -149,7 +149,7 @@
   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 bit, c19 bool, c20 char,
   c21 char(10), c22 varchar(30), c23 tinyblob, c24 tinytext,
   c25 blob, c26 text, c27 mediumblob, c28 mediumtext,
Thread
• bk commit into 5.0 tree (msvensson:1.1971) BUG#10466	msvensson	16 Jun