bzr push into mysql-5.0-bugteam branch (svoj:2728 to 2729) Bug#36966

[Sergey Vojtovich]

 2729 Sergey Vojtovich	2009-04-21
      BUG#36966 - mysqldump.test fails in pushbuild
      
      mysqldump.test is designed to run with concurrent inserts
      disabled. It is disabling concurrent inserts at the very
      beginning of the test case, and re-enables them at the
      bottom of the test. But for some reason (likely incorrect
      merge) we enable concurrent inserts in the middle of the test.
      
      The problem is fixed by enabling concurrent inserts only
      at the bottom of the test case.
      modified:
        mysql-test/r/mysqldump.result
        mysql-test/t/mysqldump.test

 2728 Georgi Kodinov	2009-04-17
      Bug #35087: Inserting duplicate values at one time with DES_ENCRYPT leads 
        to wrong results
            
      3 problems found with DES_ENCRYPT/DES_DECRYPT :
      
      1. The max length was not calculated properly. Fixed in fix_length_and_dec()
      2. DES_ENCRYPT had a side effect of sometimes reallocating and changing 
      the value of its argument. Fixed by explicitly pre-allocating the necessary
      space to pad the argument with trailing '*' (stars) when calculating the 
      DES digest.
      3. in DES_ENCRYPT the string buffer for the result value was not 
      reallocated to the correct size and only string length was assigned to it. 
      Fixed by making sure there's enough space to hold the result.
      modified:
        mysql-test/r/func_des_encrypt.result
        mysql-test/t/func_des_encrypt.test
        sql/item_strfunc.cc
        sql/item_strfunc.h

=== modified file 'mysql-test/r/mysqldump.result'
--- a/mysql-test/r/mysqldump.result	2009-03-10 16:53:43 +0000
+++ b/mysql-test/r/mysqldump.result	2009-04-21 09:01:13 +0000
@@ -3557,7 +3557,6 @@ DROP TABLE t1,t2;
 
 
 -- Dump completed on DATE
-SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
 #
 # Bug #42635: mysqldump includes views that were excluded using 
 #   the --ignore-table option
@@ -3693,6 +3692,7 @@ UNLOCK TABLES;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE `כדשגכחךלדגכחשךדגחכךלדגכ`;
 SET NAMES latin1;
+SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
 #
 # End of 5.0 tests
 #

=== modified file 'mysql-test/t/mysqldump.test'
--- a/mysql-test/t/mysqldump.test	2009-03-10 16:53:43 +0000
+++ b/mysql-test/t/mysqldump.test	2009-04-21 09:01:13 +0000
@@ -1646,9 +1646,6 @@ DROP TABLE t1,t2;
 --replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// / on [0-9 :-]+/ on DATE/
 --exec $MYSQL_DUMP test
 
-# We reset concurrent_inserts value to whatever it was at the start of the test
-SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
-
 --echo #
 --echo # Bug #42635: mysqldump includes views that were excluded using 
 --echo #   the --ignore-table option
@@ -1681,6 +1678,9 @@ CREATE TABLE `כדשגכחךלדגכחש
 DROP TABLE `כדשגכחךלדגכחשךדגחכךלדrent_inserts value to whatever it was at the start of the test
+# This line must be executed _after_ all test cases.
+SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
 
 --echo #
 --echo # End of 5.0 tests