From 48044a8b789ff415557c5fdedd121a7c36d33128 Mon Sep 17 00:00:00 2001 From: Timothy Smith Date: Wed, 11 Mar 2009 14:52:53 -0600 Subject: [PATCH 1/2] Remove outdated and now useless TODO file from sql-bench. Requested by sales. --- sql-bench/TODO | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 sql-bench/TODO 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| - From 81e4e1e79cc56be4fe9b86f23a30e81ba9f9f110 Mon Sep 17 00:00:00 2001 From: Timothy Smith Date: Wed, 11 Mar 2009 14:54:57 -0600 Subject: [PATCH 2/2] Bug #32625: Make test type_bit_innodb more robust Since there is more than one duplicate value in the table, when adding the unique index it is not deterministic which value will be reported as causing a problem. Replace the reported value with '' so that it doesn't affect the results. --- mysql-test/t/type_bit_innodb.test | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mysql-test/t/type_bit_innodb.test b/mysql-test/t/type_bit_innodb.test index dbca69d67f0..e7e66da8927 100644 --- a/mysql-test/t/type_bit_innodb.test +++ b/mysql-test/t/type_bit_innodb.test @@ -40,7 +40,9 @@ 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; ---error 1062 +# 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;