diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-03-01 09:57:36 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-03-01 09:57:36 +0100 |
| commit | 409f02299f73bdc5665985cc1bcdbddc9d9a6313 (patch) | |
| tree | 3ac8445c4b8d51db4b0f86c2fb7e943a4aaf043d /mysql-test/r | |
| parent | 0466a9094494f3b49d7308b614131894d30ba710 (diff) | |
| parent | b70aaf38bc351045af3d2415d94fddf80f2c5e22 (diff) | |
| download | mariadb-git-409f02299f73bdc5665985cc1bcdbddc9d9a6313.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
mysql-test/t/disabled.def:
Auto merged
sql/sql_partition.cc:
Auto merged
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/ndb_partition_range.result | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/r/ndb_partition_range.result b/mysql-test/r/ndb_partition_range.result index e078f38c166..546c0b1196c 100644 --- a/mysql-test/r/ndb_partition_range.result +++ b/mysql-test/r/ndb_partition_range.result @@ -159,13 +159,15 @@ a2 TEXT NOT NULL, a3 BIT NOT NULL, a4 DECIMAL(8,3), a5 INT NOT NULL, -a6 VARCHAR(255), +a6 INT, PRIMARY KEY(a1)) TABLESPACE ts1 STORAGE DISK ENGINE=NDB PARTITION BY LIST (a1) (PARTITION p0 VALUES IN (1,2,3,4,5), PARTITION p1 VALUES IN (6,7,8,9, 10), PARTITION p2 VALUES IN (11, 12, 13, 14, 15)); +ALTER TABLE test.t1 DROP COLUMN a6; +ALTER TABLE test.t1 ADD COLUMN a6 VARCHAR(255); SELECT COUNT(*) FROM test.t1; COUNT(*) 15 |