diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-06-27 13:12:10 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-06-27 13:12:10 +0200 |
| commit | fed72117dcac8ad2ffe6da70d69f65dc2d793538 (patch) | |
| tree | 26f6797a8c487e5daea5e57b90ea9ce58579c0b6 /mysql-test/r/ps_6bdb.result | |
| parent | 85c0b742b2834060a4c5c326db20ebd50e7f2dd5 (diff) | |
| parent | 18cb4f0d7c6038b02a2f9e3994f256b6d276ac51 (diff) | |
| download | mariadb-git-fed72117dcac8ad2ffe6da70d69f65dc2d793538.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug10466
mysql-test/r/alias.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/alias.test:
Auto merged
mysql-test/t/func_str.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/group_by.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
Diffstat (limited to 'mysql-test/r/ps_6bdb.result')
| -rw-r--r-- | mysql-test/r/ps_6bdb.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ps_6bdb.result b/mysql-test/r/ps_6bdb.result index 87b1b110f42..404c25c2c37 100644 --- a/mysql-test/r/ps_6bdb.result +++ b/mysql-test/r/ps_6bdb.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, |