diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-04-30 19:41:27 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-04-30 19:41:27 +0500 |
| commit | cbaf262616af184428caa31e8464edc3911d826c (patch) | |
| tree | b17c75c534a81e973fe16560783152620ce76852 /mysql-test/r/partition.result | |
| parent | 9be5c10fca989ff9d8efdd2cc12b57c62dcaefb6 (diff) | |
| parent | 611456362f520bd5b3380e7cf90cfb2aaadd18be (diff) | |
| download | mariadb-git-cbaf262616af184428caa31e8464edc3911d826c.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/home/hf/work/27123/my51-27123
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/key.cc:
Auto merged
sql/field.h:
merging
Diffstat (limited to 'mysql-test/r/partition.result')
| -rw-r--r-- | mysql-test/r/partition.result | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result index 8e0ae617a6b..3549e987d73 100644 --- a/mysql-test/r/partition.result +++ b/mysql-test/r/partition.result @@ -1225,4 +1225,12 @@ t2 CREATE TABLE `t2` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (i) (PARTITION p01 VALUES LESS THAN (1000) ENGINE = MyISAM) */ DROP TABLE t1, t2; set @@sql_mode=@org_mode; +create table t1 (c1 varchar(255),c2 tinyint,primary key(c1)) +partition by key (c1) partitions 10 ; +insert into t1 values ('aaa','1') on duplicate key update c2 = c2 + 1; +insert into t1 values ('aaa','1') on duplicate key update c2 = c2 + 1; +select * from t1; +c1 c2 +aaa 2 +drop table t1; End of 5.1 tests |