diff options
| author | unknown <bar@mysql.com> | 2005-10-13 19:19:05 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-10-13 19:19:05 +0500 |
| commit | 842fd992f6d6b2a9575e8a7dd16f374fb6842338 (patch) | |
| tree | a73fcc3c0ebfb9135114b842b2096b267ae08e5d /mysql-test/t/federated.test | |
| parent | 99ed34376fde520a135756480334090db2a609a5 (diff) | |
| parent | 60e411eb32fd31135cf805202a302bc7a050b757 (diff) | |
| download | mariadb-git-842fd992f6d6b2a9575e8a7dd16f374fb6842338.tar.gz | |
Merge abarkov@bk-internal:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0.b9278
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/cast.result:
Auto merged
mysql-test/r/federated.result:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysql-test/t/cast.test:
Auto merged
mysql-test/t/federated.test:
Auto merged
Diffstat (limited to 'mysql-test/t/federated.test')
| -rw-r--r-- | mysql-test/t/federated.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/federated.test b/mysql-test/t/federated.test index b1b6baa2f33..9880cd78653 100644 --- a/mysql-test/t/federated.test +++ b/mysql-test/t/federated.test @@ -351,7 +351,7 @@ DROP TABLE IF EXISTS federated.t1; CREATE TABLE federated.t1 ( `id` int NOT NULL auto_increment, `name` char(32) NOT NULL DEFAULT '', - `bincol` binary(4) NOT NULL, + `bincol` binary(1) NOT NULL, `floatval` decimal(5,2) NOT NULL DEFAULT 0.0, `other` int NOT NULL DEFAULT 0, PRIMARY KEY (id), @@ -366,7 +366,7 @@ DROP TABLE IF EXISTS federated.t1; eval CREATE TABLE federated.t1 ( `id` int NOT NULL auto_increment, `name` char(32) NOT NULL DEFAULT '', - `bincol` binary(4) NOT NULL, + `bincol` binary(1) NOT NULL, `floatval` decimal(5,2) NOT NULL DEFAULT 0.0, `other` int NOT NULL DEFAULT 0, PRIMARY KEY (id), |