diff options
| author | Timothy Smith <timothy.smith@sun.com> | 2009-03-11 15:03:25 -0600 |
|---|---|---|
| committer | Timothy Smith <timothy.smith@sun.com> | 2009-03-11 15:03:25 -0600 |
| commit | 676c9824255ba943dae88afe5fc515f227e21a0a (patch) | |
| tree | 5551539dd053e69d502dc79ac507b7a5d03f7833 | |
| parent | f79cb0de91a6b320966a7675dd6998c0bcf128e5 (diff) | |
| parent | 81e4e1e79cc56be4fe9b86f23a30e81ba9f9f110 (diff) | |
| download | mariadb-git-676c9824255ba943dae88afe5fc515f227e21a0a.tar.gz | |
Up-merge from 5.0
| -rw-r--r-- | mysql-test/t/type_bit_innodb.test | 2 | ||||
| -rw-r--r-- | sql-bench/TODO | 21 |
2 files changed, 2 insertions, 21 deletions
diff --git a/mysql-test/t/type_bit_innodb.test b/mysql-test/t/type_bit_innodb.test index 85c9127b2f6..e7e66da8927 100644 --- a/mysql-test/t/type_bit_innodb.test +++ b/mysql-test/t/type_bit_innodb.test @@ -40,6 +40,8 @@ drop table t1; create table t1 (a bit) engine=innodb; insert into t1 values (b'0'), (b'1'), (b'000'), (b'100'), (b'001'); select hex(a) from t1; +# It is not deterministic which duplicate will be seen first +--replace_regex /(.*Duplicate entry )'.*'( for key.*)/\1''\2/ --error ER_DUP_ENTRY alter table t1 add unique (a); drop table t1; diff --git a/sql-bench/TODO b/sql-bench/TODO deleted file mode 100644 index 8a103e89199..00000000000 --- a/sql-bench/TODO +++ /dev/null @@ -1,21 +0,0 @@ -When comparing with ms-sql: - -Check how to get MySQL faster mysql ms-sql - -count_distinct (2000) | 89.00| 39.00| -count_distinct_big (120) | 324.00| 121.00| -count_distinct_group (1000) | 158.00| 107.00| -count_distinct_group_on_key (1000) | 49.00| 17.00| -count_distinct_group_on_key_parts (1| 157.00| 108.00| -order_by_big (10) | 197.00| 89.00| -order_by_big_key (10) | 170.00| 82.00| -order_by_big_key2 (10) | 163.00| 73.00| -order_by_big_key_desc (10) | 172.00| 84.00| -order_by_big_key_diff (10) | 193.00| 89.00| -order_by_big_key_prefix (10) | 165.00| 72.00| - - -Why is the following slow on NT: - NT Linux -update_of_primary_key_many_keys (256| 560.00| 65.00| - |