From: Timothy Smith
Date: March 11 2009 9:50pm
Subject: bzr push into mysql-5.0-bugteam branch (timothy.smith:2775 to 2777)
 Bug#32625
List-Archive: http://lists.mysql.com/commits/68968
X-Bug: 32625
Message-Id: <20090311215034.9ABABE269@ramayana.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_ZJcHX8sA2ijAqnxlCB5kKQ)"

--Boundary_(ID_ZJcHX8sA2ijAqnxlCB5kKQ)
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii
Content-transfer-encoding: 7BIT
Content-disposition: inline

 2777 Timothy Smith	2009-03-11
      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.

    modified:
      mysql-test/t/type_bit_innodb.test
 2776 Timothy Smith	2009-03-11
      Remove outdated and now useless TODO file from sql-bench.  Requested by sales.

    removed:
      sql-bench/TODO
 2775 Georgi Kodinov	2009-03-09
      Bug #42434: license of mysys MD5 implementation is not GPL-compatible
      
      Took the Xfree implementation (based on the same rewrite as the NDB one)
      and added it instead of the current implementation.
      Added a macro to make the calls to MD5 more streamlined. 
     @ client/mysqlmanager-pwgen.c
        Bug #42434: changed to call the macro
     @ include/my_md5.h
        Bug #42434: use the Xfree implementation
     @ mysys/md5.c
        Bug #42434: use the Xfree implementation
     @ sql/item_strfunc.cc
        Bug #42434: changed to call the macro
     @ sql/table.cc
        Bug #42434: changed to call the macro
     @ tools/mysqlmanager.c
        Bug #42434: changed to call the macro

    modified:
      client/mysqlmanager-pwgen.c
      include/my_md5.h
      mysys/md5.c
      sql/item_strfunc.cc
      sql/table.cc
      tools/mysqlmanager.c
=== modified file 'mysql-test/t/type_bit_innodb.test'
--- a/mysql-test/t/type_bit_innodb.test	2006-04-05 00:54:58 +0000
+++ b/mysql-test/t/type_bit_innodb.test	2009-03-11 20:54:57 +0000
@@ -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;
 

=== removed file 'sql-bench/TODO'
--- a/sql-bench/TODO	2001-03-11 19:20:15 +0000
+++ b/sql-bench/TODO	1970-01-01 00:00:00 +0000
@@ -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|
-


--Boundary_(ID_ZJcHX8sA2ijAqnxlCB5kKQ)
MIME-version: 1.0
Content-type: text/bzr-bundle;
 name="bzr/timothy.smith@stripped";
 charset=us-ascii
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/timothy.smith@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: timothy.smith@stripped
# target_branch: file:///home/tsmith/m/bzr/bugteam/50/
# testament_sha1: 28f5e37a1002ea9002b06233bb7c53e2e854bb08
# timestamp: 2009-03-11 15:50:34 -0600
# base_revision_id: joro@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYsAqPMAAptfgEAQWff//1Yj
3iS////wUAXjTz3s9M2kPdg08gDCSSaT0mIJP0yBppT8qepshojAaGgg0CSpk1T2p6TJ6NJqMjQB
oBkAAAAJTSRoJPJlNqNDQDQaAANAA2oCKSp6NpqnpAA0NqAAGgAAAAkkJkBNNNGk2QhiaKeaEnqP
QQAaephKMnxTqOhuPD4PUlhpzy5yUWhMLGMQky1vIxOYWqxxZkaXs8HzuwHDyUPn51LyoYZll4qp
5IYX0RPGGzOyRfu3dcYzVRixcT3GjePWWpu++Oj3e+YHysOGvrPye2CYg4nwUTSuL5EDzLm+nJBZ
qsUKVKEn7DFV1bpI2Su3sMpcdGC3c+ZuTDK6292iInvKx4g5rc4xobZ173zN03tzXudaJiOkJ0BY
fQW247NJCM2ZrStQkHJaCePJr21wnzGdgCKS5rz2Bl+QiJFm2VKUgOTxzD/xHDjrGODIDMiQBCYj
EsNplMUITPIDsVBOANCgw1tIsJlDVMeBy2uGuIj4qJX7VZlEZlx3Urzs9w6Aw6U2RBmZb0VfViIj
YJxOfWMmDAlNSlXdNVghE6FmYcaAcW6Bks7T2j4lxJ4wqy8gZyoWqZ+tVpUuAGJyiXs4sH1ESBOT
Gv2wA7j16JUU1xuHbSbfTkl42HaESCLphFMHMOAtZswidCkR6i9xUmIG4+52Chl2uzBUvcebG64J
NclePSM8wFCbrjgDys6i41HsRWGQUYmbWTHWTUrQ83SWU2goHEI1kTfE1RoohWKkdaNTrTGUFneQ
MVrCRgNlYZIwjh6kPGV2DymdMkQG2k6e18QDbTR2ROM5Qpio72fXtEUxoRAriJsTEkGVQ0tZjD0F
MMkbhg0nMrdEO8e8bUB4MP7T5Leeo8gOESA5AycRrMmGhWIEketme/ulfeaPtovUKJSZN92E+i7O
+iwNTYdnYcHGcWrdjlSKoDcpEjlHPiXcepA7JUvZwdgvu72+FnVRbIncW1CH/tBg9Fyb0cHQ8i88
Rx77/fyOgWHyLSk+sTqPENPnqLB1HeLIwDEnMTWTiip/Uzkp27T6OJEE2ge4PokFB2wYIsabDO/E
yIhBDFIi64L8aissJ9SzVihQxsL01xQfW3thE53tFpJIM0hy2dxKOrfjLC0xm3lXANexRMgRThW2
GcYXvemzeBXK9XXDauWmN78gsrEGpMm24WlFTjuwAs4BrN79gSQxuzUlg5JTuiG+RMledgbDWYHI
xOZtC9cP1y5sGRwcl3HE3GMxhcZisRA09k/+mkeEjYsEVLgl4kElDeJzhojBd9XZxOHIDUDcRbnH
anj7zE8hEQ7VkbhVEA9xkl9t58axOz6quRYH88CJIkkrrXrJJPHG0KS5kBYSZekpS3qPqrJ0rta+
2K+FIozB/EsJcRI3ms0sDVTwToHM5k9A+Zdlp5dARVyRFe51lgQOJcktpQYEUBTSdS26ib/tvEfP
SNQ+Cr0iB0UKteRfrJxJbzDIsJ5BjWAuCx3CxaoEgZWzc9LRmEsEaaJNWmwVCUwjokk4G5qGS5Je
QL91L4ZxOHmRkYoiTLoFAGo1pjM7nSUgxItVi36adJWY49FMEBbhzjioiN2BdcMOuGE8tSonoQ4Z
Xxu2RgBjLROOBmCTgKM0yeppmGBhsMZBX+BId1Y0DLMn1JJ2qtHskpT81pal+RwSiiu9wFhIXqJ/
EQPzGg1fO8o+GhxiUjGrMdOB4E4cqQ8SjBihRUBtMGxLCWKqcMUiByVwgnJweH3MjJaxw5NKQs4t
OgcVsFTIrHBXTxKBeE/gw3z5EyQc/tIfTr8Mi0vmTXCzL0NiS7rSNZ3mgakUjySYMPYY3l3zmmSU
x5iiOJjmWpQDaVjFVJzkRWlV3LEVDJf8XckU4UJCLAKjzA==


--Boundary_(ID_ZJcHX8sA2ijAqnxlCB5kKQ)--