summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps_7ndb.result
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2005-06-27 13:12:10 +0200
committermsvensson@neptunus.(none) <>2005-06-27 13:12:10 +0200
commit88c96026af42b4798fa278ebc3dc9f2b1a407d2b (patch)
tree26f6797a8c487e5daea5e57b90ea9ce58579c0b6 /mysql-test/r/ps_7ndb.result
parentdcb4789dcb7560ef285fef7ebb0bce7a16a58d37 (diff)
parent8aaad90786a031a6c19f019a67c2cf3ebc7b4be8 (diff)
downloadmariadb-git-88c96026af42b4798fa278ebc3dc9f2b1a407d2b.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug10466
Diffstat (limited to 'mysql-test/r/ps_7ndb.result')
-rw-r--r--mysql-test/r/ps_7ndb.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ps_7ndb.result b/mysql-test/r/ps_7ndb.result
index c158156d11d..ffddec6d5c2 100644
--- a/mysql-test/r/ps_7ndb.result
+++ b/mysql-test/r/ps_7ndb.result
@@ -10,7 +10,7 @@ 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,