------------------------------------------------------------
revno: 3409 [merge]
tags: clone-5.1.48-build
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
branch nick: merge-5.1-bugteam
timestamp: Wed 2010-06-02 11:44:11 +0300
message:
  merge
    ------------------------------------------------------------
    revno: 1810.3987.21
    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
    branch nick: merge-5.0-bugteam
    timestamp: Wed 2010-06-02 11:42:37 +0300
    message:
      changed the tree name
------------------------------------------------------------
revno: 3408
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
branch nick: merge-5.1-bugteam
timestamp: Tue 2010-06-01 15:16:35 +0300
message:
  Bug#40928 : make main.func_str experimental on Solaris
------------------------------------------------------------
revno: 3407
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
branch nick: merge-5.1-bugteam
timestamp: Tue 2010-06-01 15:14:38 +0300
message:
  Bug #54138 : making main.sp and rpl.rpl_row_sp011 experimental on solaris
------------------------------------------------------------
revno: 3406 [merge]
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
branch nick: merge-5.1-bugteam
timestamp: Tue 2010-06-01 14:48:24 +0300
message:
  merged mysql-5.0-bugteam -> mysql-5.1-bugteam
    ------------------------------------------------------------
    revno: 1810.3987.20 [merge]
    committer: Georgi Kodinov <joro@sun.com>
    branch nick: merge-5.0-bugteam
    timestamp: Tue 2010-06-01 14:28:58 +0300
    message:
      merged mysql-5.0 to mysql-5.0-bugteam
        ------------------------------------------------------------
        revno: 1810.3990.3 [merge]
        author: joerg.bruehe@sun.com
        committer: MySQL Build Team<build@mysql.com>
        branch nick: mysql-5.0
        timestamp: Wed 2010-05-19 20:02:53 +0200
        message:
          Merge from mysql-5.0.91-release
            ------------------------------------------------------------
            revno: 1810.3992.1
            tags: mysql-5.0.91
            committer: Sunanda Menon <sunanda.menon@sun.com
            branch nick: mysql-5.0.91-release
            timestamp: Wed 2010-05-05 15:33:46 +0200
            message:
              ------------------------------------------------------------
              revno: 2861
              committer: Georgi Kodinov <joro@sun.com>
              branch nick: B53371-5.0-bugteam
              timestamp: Mon 2010-05-03 18:16:51 +0300
              message:
                Bug #53371: COM_FIELD_LIST can be abused to bypass table level grants.
                
                The server was not checking the supplied to COM_FIELD_LIST table name
                for validity and compliance to acceptable table names standards.
                Fixed by checking the table name for compliance similar to how it's 
                normally checked by the parser and returning an error message if 
                it's not compliant.
------------------------------------------------------------
revno: 3405 [merge]
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
branch nick: merge-5.1-bugteam
timestamp: Tue 2010-06-01 14:44:31 +0300
message:
  merge mysql-5.1 -> mysql-5.1-bugteam
    ------------------------------------------------------------
    revno: 3370.2.4 [merge]
    committer: Vasil Dimov <vasil.dimov@oracle.com>
    branch nick: mysql-5.1
    timestamp: Mon 2010-05-31 11:23:07 +0300
    message:
      Merge mysql-5.1-innodb -> mysql-5.1
        ------------------------------------------------------------
        revno: 3351.14.123
        committer: Jimmy Yang <jimmy.yang@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Fri 2010-05-28 06:17:37 -0700
        message:
          This is to fix a special case for the fix on bug #53592, where the
          err_index could be not a member of the share structure or prebuilt
          structure passed from MySQL. For now, we resort to the traditional
          way of scanning index->table for the index number.
        ------------------------------------------------------------
        revno: 3351.14.122
        committer: Inaam Rana <inaam.rana@oracle.com>
        branch nick: 5.1
        timestamp: Thu 2010-05-27 12:31:00 -0400
        message:
          Fix the printout in for long semaphore waits to not
          list a thread doing a wait_ex as an s-lock waiter.
        ------------------------------------------------------------
        revno: 3351.14.121
        committer: Jimmy Yang <jimmy.yang@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Tue 2010-05-25 22:38:14 -0700
        message:
          Update ChangeLog for bug fix regarding 53582.
        ------------------------------------------------------------
        revno: 3351.14.120
        committer: Jimmy Yang <jimmy.yang@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Tue 2010-05-25 22:31:27 -0700
        message:
          Fix Bug #53592 in plugin code, "crash replacing duplicates into table
          after fast alter table added unique key". Look up MySQL index number should
          go through index translation table.
          
          rb://347, approved by Marko
        ------------------------------------------------------------
        revno: 3351.14.119 [merge]
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Tue 2010-05-25 17:21:33 +0300
        message:
          Merge mysql-5.1-innodb from bk-internal into my local tree
            ------------------------------------------------------------
            revno: 3351.50.4
            committer: Marko M?kel? <marko.makela@oracle.com>
            branch nick: 5.1-innodb
            timestamp: Tue 2010-05-25 15:53:52 +0300
            message:
              row_search_for_mysql(): Add assertions to track down Bug #53627.
            ------------------------------------------------------------
            revno: 3351.50.3
            committer: Marko M?kel? <marko.makela@oracle.com>
            branch nick: 5.1-innodb
            timestamp: Tue 2010-05-25 15:37:48 +0300
            message:
              Suppress bogus Valgrind warnings about buf_buddy_relocate()
              accessing uninitialized memory in Valgrind-instrumented builds.
        ------------------------------------------------------------
        revno: 3351.14.118 [merge]
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Tue 2010-05-25 12:45:17 +0300
        message:
          Merge mysql-5.1 into mysql-5.1-innodb
          (this changeset does not introduce any changes)
        ------------------------------------------------------------
        revno: 3351.14.117 [merge]
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Tue 2010-05-25 12:14:57 +0300
        message:
          Merge mysql-5.1-innodb from bk-internal into my local tree
            ------------------------------------------------------------
            revno: 3351.50.2
            committer: Marko M?kel? <marko.makela@oracle.com>
            branch nick: 5.1-innodb
            timestamp: Mon 2010-05-24 14:43:49 +0300
            message:
              Document the Bug #53578 fix.
            ------------------------------------------------------------
            revno: 3351.50.1
            committer: Marko M?kel? <marko.makela@oracle.com>
            branch nick: 5.1-innodb
            timestamp: Mon 2010-05-24 14:04:39 +0300
            message:
              Bug#53578: assert on invalid page access, in fil_io()
              
              Store the max_space_id in the data dictionary header in order to avoid
              space_id reuse.
              
              DICT_HDR_MIX_ID: Renamed to DICT_HDR_MAX_SPACE_ID, DICT_HDR_MIX_ID_LOW.
              
              dict_hdr_get_new_id(): Return table_id, index_id, space_id or a subset of them.
              
              fil_system_t: Add ibool space_id_reuse_warned.
              
              fil_create_new_single_table_tablespace(): Get the space_id from the caller.
              
              fil_space_create(): Issue a warning if the fil_system->max_assigned_id
              is exceeded.
              
              fil_assign_new_space_id(): Return TRUE/FALSE and take a pointer to the
              space_id as a parameter. Make the function public.
              
              fil_init(): Initialize all fil_system fields by mem_zalloc(). Remove
              explicit initializations of certain fields to 0 or NULL.
        ------------------------------------------------------------
        revno: 3351.14.116
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Tue 2010-05-25 11:01:03 +0300
        message:
          Fix comments on row_merge_write()
          
          This is a port of
          vasil.dimov@oracle.com-20100521175337-c1b1lqxgizqegb0w and
          vasil.dimov@oracle.com-20100521180951-mef23h24k023xuwq
          from mysql-trunk-innodb
        ------------------------------------------------------------
        revno: 3351.14.115 [merge]
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Thu 2010-05-20 16:31:57 +0300
        message:
          Merge mysql-5.1-innodb from bk-internal into my local tree
            ------------------------------------------------------------
            revno: 3351.49.2
            committer: Marko M?kel? <marko.makela@oracle.com>
            branch nick: 5.1-innodb
            timestamp: Thu 2010-05-20 16:07:34 +0300
            message:
              buf_LRU_free_block(): Correct an error in the comment.
        ------------------------------------------------------------
        revno: 3351.14.114
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Thu 2010-05-20 16:27:35 +0300
        message:
          Disable main.ps_3innodb for valgrind tests since it results in known
          failures, that are described in
          
          Bug#38999 valgrind warnings for update statement in function compare_record()
          
          At the time I am adding this the failures are:
          
          main.ps_3innodb                          [ fail ]  Found warnings/errors in server log file!
                  Test ended at 2010-05-20 01:17:34
          line
          ==31559== Thread 11:
          ==31559== Conditional jump or move depends on uninitialised value(s)
          ==31559==    at 0x75C5BD: compare_record(st_table*) (sql_update.cc:35)
          ==31559==    by 0x744732: write_record(THD*, st_table*, st_copy_info*) (sql_insert.cc:1486)
          ==31559==    by 0x74A0D7: mysql_insert(THD*, TABLE_LIST*, List<Item>&, List<List<Item> >&, List<Item>&, List<Item>&, enum_duplicates, bool) (sql_insert.cc:835)
          ==31559==    by 0x6A79B4: mysql_execute_command(THD*) (sql_parse.cc:3198)
          ==31559==    by 0x754998: Prepared_statement::execute(String*, bool) (sql_prepare.cc:3583)
          ==31559==    by 0x754C4F: Prepared_statement::execute_loop(String*, bool, unsigned char*, unsigned char*) (sql_prepare.cc:3258)
          ==31559==    by 0x754F33: mysql_sql_stmt_execute(THD*) (sql_prepare.cc:2529)
          ==31559==    by 0x6A5028: mysql_execute_command(THD*) (sql_parse.cc:2272)
          ==31559==    by 0x6ADAE8: mysql_parse(THD*, char const*, unsigned, char const**) (sql_parse.cc:5986)
          ==31559==    by 0x6AF3A4: dispatch_command(enum_server_command, THD*, char*, unsigned) (sql_parse.cc:1233)
          ==31559==    by 0x6B0800: do_command(THD*) (sql_parse.cc:874)
          ==31559==    by 0x69CB46: handle_one_connection (sql_connect.cc:1134)
          ==31559==    by 0x33EDA062F6: start_thread (in /lib64/libpthread-2.5.so)
          ==31559==    by 0x33ECED1B6C: clone (in /lib64/libc-2.5.so)
          ==31559== Conditional jump or move depends on uninitialised value(s)
          ==31559==    at 0x75C5D0: compare_record(st_table*) (sql_update.cc:35)
          ==31559==    by 0x744732: write_record(THD*, st_table*, st_copy_info*) (sql_insert.cc:1486)
          ==31559==    by 0x74A0D7: mysql_insert(THD*, TABLE_LIST*, List<Item>&, List<List<Item> >&, List<Item>&, List<Item>&, enum_duplicates, bool) (sql_insert.cc:835)
          ==31559==    by 0x6A79B4: mysql_execute_command(THD*) (sql_parse.cc:3198)
          ==31559==    by 0x754998: Prepared_statement::execute(String*, bool) (sql_prepare.cc:3583)
          ==31559==    by 0x754C4F: Prepared_statement::execute_loop(String*, bool, unsigned char*, unsigned char*) (sql_prepare.cc:3258)
          ==31559==    by 0x754F33: mysql_sql_stmt_execute(THD*) (sql_prepare.cc:2529)
          ==31559==    by 0x6A5028: mysql_execute_command(THD*) (sql_parse.cc:2272)
          ==31559==    by 0x6ADAE8: mysql_parse(THD*, char const*, unsigned, char const**) (sql_parse.cc:5986)
          ==31559==    by 0x6AF3A4: dispatch_command(enum_server_command, THD*, char*, unsigned) (sql_parse.cc:1233)
          ==31559==    by 0x6B0800: do_command(THD*) (sql_parse.cc:874)
          ==31559==    by 0x69CB46: handle_one_connection (sql_connect.cc:1134)
          ==31559==    by 0x33EDA062F6: start_thread (in /lib64/libpthread-2.5.so)
          ==31559==    by 0x33ECED1B6C: clone (in /lib64/libc-2.5.so)
          ^ Found warnings in /export/home4/pb2/test/sb_3-1827397-1274300957.87/mysql-5.1.48-linux-x86_64-test/mysql-test/var-n_mix/log/mysqld.1.err
        ------------------------------------------------------------
        revno: 3351.14.113 [merge]
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Thu 2010-05-20 15:54:03 +0300
        message:
          Merge mysql-5.1-innodb from bk-internal into my local tree
            ------------------------------------------------------------
            revno: 3351.49.1
            committer: Marko M?kel? <marko.makela@oracle.com>
            branch nick: 5.1-innodb
            timestamp: Thu 2010-05-20 13:40:42 +0300
            message:
              Bug#53593: Add some instrumentation to improve Valgrind sensitivity
              
              BUILD/*: Add valgrind_configs=--with-valgrind.
              BUILD/*: Remove -USAFEMALLOC from valgrind_flags.
              
              configure.in: Add AC_ARG_WITH(valgrind) and HAVE_VALGRIND.
              
              include/my_sys.h: Define a number of MEM_ wrappers for VALGRIND_ functions.
              include/my_sys.h: Make TRASH do MEM_UNDEFINED().
              
              include/m_string.h: Remove unused macro bzero_if_purify(A,B).
              
              _mymalloc(): Declare MEM_UNDEFINED() on the allocated memory.
              
              _myfree(): Declare MEM_NOACCESS() on the freed memory.
              
              storage/innobase/include/univ.i: Enable UNIV_DEBUG_VALGRIND based on
              HAVE_VALGRIND rather than HAVE_purify.
              
              Possible things to do:
               * In my_global.h, remove the defined(HAVE_purify) condition
                 from the _WIN32 uint3korr().
               * In my_global.h *int*korr(), use | instead of +
                 in order to keep the Valgrind V bits accurate
               * Consider replacing HAVE_purify with HAVE_VALGRIND
               * Use VALGRIND_CREATE_BLOCK, VALGRIND_DISCARD in mem_root and similar places
        ------------------------------------------------------------
        revno: 3351.14.112
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Thu 2010-05-20 10:50:07 +0300
        message:
          Merge from mysql-trunk-innodb into mysql-5.1-innodb/storage/innodb_plugin:
          
            ------------------------------------------------------------
            revno: 3094
            revision-id: vasil.dimov@oracle.com-20100513074652-0cvlhgkesgbb2bfh
            parent: vasil.dimov@oracle.com-20100512173700-byf8xntxjur1hqov
            committer: Vasil Dimov <vasil.dimov@oracle.com>
            branch nick: mysql-trunk-innodb
            timestamp: Thu 2010-05-13 10:46:52 +0300
            message:
              Followup to Bug#51920, fix binlog.binlog_killed
              
              This is a followup to the fix of
              
              Bug#51920 Innodb connections in row lock wait ignore KILL until lock wait
              timeout
              
              in that fix (rb://279) the behavior was changed to honor when a trx is
              interrupted during lock wait, but the returned error code was still
              "lock wait timeout" when it should be "interrupted".
              
              This change fixes the non-deterministically failing test binlog.binlog_killed,
              that failed like this:
              
              binlog.binlog_killed 'stmt'              [ fail ]
                      Test ended at 2010-05-12 11:39:08
              
              CURRENT_TEST: binlog.binlog_killed
              mysqltest: At line 208: query 'reap' failed with wrong errno 1205: 'Lock wait timeout exceeded; try restarting transaction', instead of 0...
              
              Approved by:	Sunny Bains (rb://344)
            ------------------------------------------------------------
        ------------------------------------------------------------
        revno: 3351.14.111
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Thu 2010-05-20 10:39:02 +0300
        message:
          Merge from mysql-trunk-innodb into mysql-5.1-innodb/storage/innobase:
          
            ------------------------------------------------------------
            revno: 3094
            revision-id: vasil.dimov@oracle.com-20100513074652-0cvlhgkesgbb2bfh
            parent: vasil.dimov@oracle.com-20100512173700-byf8xntxjur1hqov
            committer: Vasil Dimov <vasil.dimov@oracle.com>
            branch nick: mysql-trunk-innodb
            timestamp: Thu 2010-05-13 10:46:52 +0300
            message:
              Followup to Bug#51920, fix binlog.binlog_killed
              
              This is a followup to the fix of
              
              Bug#51920 Innodb connections in row lock wait ignore KILL until lock wait
              timeout
              
              in that fix (rb://279) the behavior was changed to honor when a trx is
              interrupted during lock wait, but the returned error code was still
              "lock wait timeout" when it should be "interrupted".
              
              This change fixes the non-deterministically failing test binlog.binlog_killed,
              that failed like this:
              
              binlog.binlog_killed 'stmt'              [ fail ]
                      Test ended at 2010-05-12 11:39:08
              
              CURRENT_TEST: binlog.binlog_killed
              mysqltest: At line 208: query 'reap' failed with wrong errno 1205: 'Lock wait timeout exceeded; try restarting transaction', instead of 0...
              
              Approved by:	Sunny Bains (rb://344)
            ------------------------------------------------------------
          
          This merge is non-trivial since it has to introduce the DB_INTERRUPTED
          error code.
          
          Also revert vasil.dimov@oracle.com-20100408165555-9rpjh24o0sa9ad5y
          which adjusted the binlog.binlog_killed test to the new (wrong) behavior
        ------------------------------------------------------------
        revno: 3351.14.110
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-05-19 11:16:18 +0300
        message:
          Make UNIV_DEBUG Valgrind friendly in the built-in InnoDB.
          Use | instead of +, and mask out the dont-care bits in debug assertions.
        ------------------------------------------------------------
        revno: 3351.14.109
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-05-19 11:07:43 +0300
        message:
          Make UNIV_DEBUG Valgrind friendly. Use | instead of +,
          and mask out the dont-care bits in debug assertions.
        ------------------------------------------------------------
        revno: 3351.14.108
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-05-19 11:01:52 +0300
        message:
          Silence some more bogus Valgrind warnings on non-32-bit systems. (Bug #53307)
        ------------------------------------------------------------
        revno: 3351.14.107
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-05-19 10:58:43 +0300
        message:
          Add Valgrind checks to compressed BLOB access.
        ------------------------------------------------------------
        revno: 3351.14.106
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-05-19 10:56:13 +0300
        message:
          Work around Bug #53750 in innodb.innodb_bug48024
        ------------------------------------------------------------
        revno: 3351.14.105
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-05-18 16:06:58 +0300
        message:
          Work around Bug #53750 in innodb_bug48024.test
        ------------------------------------------------------------
        revno: 3351.14.104
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: mysql-5.1-innodb2
        timestamp: Fri 2010-05-14 16:10:50 +0300
        message:
          Document Bug #48024 and Bug #53644 in the ChangeLog
        ------------------------------------------------------------
        revno: 3351.14.103
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: mysql-5.1-innodb2
        timestamp: Fri 2010-05-14 16:08:15 +0300
        message:
          Make the InnoDB FOREIGN KEY parser understand multi-statements. (Bug #48024)
          Also make InnoDB thinks that /*/ only starts a comment. (Bug #53644).
          
          This fixes the bugs in the InnoDB Plugin.
          
          ha_innodb.h: Use trx_query_string() instead of trx_query() when
          available (MySQL 5.1.42 or later).
          
          innobase_get_stmt(): New function, to retrieve the currently running
          SQL statement.
          
          struct trx_struct: Remove mysql_query_str. Use innobase_get_stmt() instead.
          
          dict_strip_comments(): Add and observe the parameter sql_length. Treat
          /*/ as the start of a comment.
          
          dict_create_foreign_constraints(), row_table_add_foreign_constraints():
          Add the parameter sql_length.
        ------------------------------------------------------------
        revno: 3351.14.102
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: mysql-5.1-innodb2
        timestamp: Fri 2010-05-14 16:02:28 +0300
        message:
          Make the InnoDB FOREIGN KEY parser understand multi-statements. (Bug #48024)
          Also make InnoDB thinks that /*/ only starts a comment. (Bug #53644).
          
          struct trx_struct: Add mysql_query_len.
          
          ha_innodb.cc: Use trx_query_string() instead of trx_query() and
          initialize trx->mysql_query_len.
          
          INNOBASE_COPY_STMT(thd, trx): New macro, to initialize
          trx->mysql_query_str and trx->mysql_query_len.
          
          dict_strip_comments(): Add and observe the parameter sql_length. Treat
          /*/ as the start of a comment.
          
          dict_create_foreign_constraints(), row_table_add_foreign_constraints():
          Add the parameter sql_length.
        ------------------------------------------------------------
        revno: 3351.14.101
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Fri 2010-05-14 13:51:26 +0300
        message:
          Remove unused code.
        ------------------------------------------------------------
        revno: 3351.14.100
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: mysql-5.1-innodb2
        timestamp: Wed 2010-05-12 13:46:03 +0300
        message:
          Document the Bug #53591 fix in the ChangeLog.
        ------------------------------------------------------------
        revno: 3351.14.99
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: mysql-5.1-innodb2
        timestamp: Wed 2010-05-12 13:42:12 +0300
        message:
          ha_innobase::add_index(): Reset trx->error_state in error handling.
          (Bug #53591)
        ------------------------------------------------------------
        revno: 3351.14.98
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: mysql-5.1-innodb2
        timestamp: Wed 2010-05-12 09:09:22 +0300
        message:
          Document recent fixes in ChangeLog.
        ------------------------------------------------------------
        revno: 3351.14.97
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: mysql-5.1-innodb2
        timestamp: Wed 2010-05-12 08:39:25 +0300
        message:
          row_merge_drop_temp_indexes(): Do not reference freed memory.
          (Bug #53471)
        ------------------------------------------------------------
        revno: 3351.14.96
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: mysql-5.1-innodb2
        timestamp: Tue 2010-05-11 19:58:45 +0300
        message:
          Fix sys_vars.tx_isolation_func.test, which was broken in revno 3432
          when making READ UNCOMMITTED lock as little as READ COMMITTED.
        ------------------------------------------------------------
        revno: 3351.14.95 [merge]
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Tue 2010-05-11 14:00:29 +0300
        message:
          Merge mysql-5.1-innodb from bk-internal locally
            ------------------------------------------------------------
            revno: 3351.47.4 [merge]
            committer: Marko M?kel? <marko.makela@oracle.com>
            branch nick: mysql-5.1-innodb2
            timestamp: Tue 2010-05-11 13:53:08 +0300
            message:
              Merge a patch from Facebook to fix Bug #53290
              
              commit e759bc64eb5c5eed4f75677ad67246797d486460
              Author: Ryan Mack
              Date:   3 days ago
              
                  Bugfix for 53290, fast unique index creation fails on duplicate null values
              
                  Summary:
                  Bug in the fast index creation code incorrectly considers null
                  values to be duplicates during block merging.  Innodb policy is that
                  multiple null values are allowed in a unique index.  Null duplicates
                  were correctly ignored while sorting individual blocks and with slow
                  index creation.
              
                  Test Plan:
                  mtr, including new test, load dbs using deferred index creation
              
                  License:
                  Copyright (C) 2009-2010 Facebook, Inc.  All Rights Reserved.
              
                  Dual licensed under BSD license and GPLv2.
              
                  Redistribution and use in source and binary forms, with or without
                  modification, are permitted provided that the following conditions are met:
                  1. Redistributions of source code must retain the above copyright notice,
                     this list of conditions and the following disclaimer.
                  2. Redistributions in binary form must reproduce the above copyright notice,
                     this list of conditions and the following disclaimer in the documentation
                     and/or other materials provided with the distribution.
              
                  THIS SOFTWARE IS PROVIDED BY FACEBOOK, INC. ``AS IS'' AND ANY EXPRESS OR
                  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
                  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
                  EVENT SHALL FACEBOOK, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
                  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
                  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
                  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
                  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
                  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
                  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
              
                  This program is free software; you can redistribute it and/or modify it
                  under the terms of the GNU General Public License as published by the Free
                  Software Foundation; version 2 of the License.
              
                  This program is distributed in the hope that it will be useful, but WITHOUT
                  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
                  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
                  more details.
              
                  You should have received a copy of the GNU General Public License along with
                  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
                  Place, Suite 330, Boston, MA  02111-1307  USA
                ------------------------------------------------------------
                revno: 3351.48.1
                committer: Marko M?kel? <marko.makela@oracle.com>
                branch nick: 5.1-innodb
                timestamp: Wed 2010-05-05 15:39:01 +0300
                message:
                  Merge a contribution from Ryan Mack at Facebook:
                  
                  Bugfix for 53290, fast unique index creation fails on duplicate null values
                  
                      Summary:
                      Bug in the fast index creation code incorrectly considers null
                      values to be duplicates during block merging.  Innodb policy is that
                      multiple null values are allowed in a unique index.  Null duplicates
                      were correctly ignored while sorting individual blocks and with slow
                      index creation.
                  
                      Test Plan:
                      mtr, including new test, load dbs using deferred index creation
                  
                      DiffCamp Revision: 110840
                      Reviewed By: mcallaghan
                      CC: mcallaghan, mysql-devel@lists
                      Revert Plan:
                      OK
            ------------------------------------------------------------
            revno: 3351.47.3
            committer: Marko M?kel? <marko.makela@oracle.com>
            branch nick: mysql-5.1-innodb2
            timestamp: Tue 2010-05-11 13:50:12 +0300
            message:
              Do not demand that buf_page_t be fully initialized on 64-bit systems.
              There may be padding before buf_page_t::zip. (Bug #53307)
            ------------------------------------------------------------
            revno: 3351.47.2
            committer: Marko M?kel? <marko.makela@oracle.com>
            branch nick: mysql-5.1-innodb2
            timestamp: Tue 2010-05-11 13:49:10 +0300
            message:
              btr_page_split_and_insert(): Add an assertion
              suggested by Sunny Bains when reviewing Bug #52964.
            ------------------------------------------------------------
            revno: 3351.47.1
            committer: Marko M?kel? <marko.makela@oracle.com>
            branch nick: mysql-5.1-innodb2
            timestamp: Tue 2010-05-11 13:45:00 +0300
            message:
              Remove a stray expression. Spotted by Sunny Bains.
        ------------------------------------------------------------
        revno: 3351.14.94
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Tue 2010-05-11 13:58:28 +0300
        message:
          Raise InnoDB Plugin version from 1.0.8 to 1.0.9.
          1.0.8 will be released in MySQL 5.1.47, so
          1.0.9 will be released in MySQL 5.1.48
        ------------------------------------------------------------
        revno: 3351.14.93 [merge]
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Tue 2010-05-11 13:41:34 +0300
        message:
          Merge mysql-5.1 into mysql-5.1-innodb
        ------------------------------------------------------------
        revno: 3351.14.92 [merge]
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Mon 2010-05-10 16:28:52 +0300
        message:
          Merge mysql-5.1-innodb from bk-internal into my local branch
            ------------------------------------------------------------
            revno: 3351.46.2
            committer: Marko Makela <mmakela@bk-internal.mysql.com>
            branch nick: mysql-5.1-innodb
            timestamp: Mon 2010-05-10 13:38:25 +0200
            message:
              Add an innodb_plugin test case for Bug #49164.
            ------------------------------------------------------------
            revno: 3351.46.1
            committer: Marko Makela <mmakela@bk-internal.mysql.com>
            branch nick: mysql-5.1-innodb
            timestamp: Mon 2010-05-10 13:37:52 +0200
            message:
              Add an innodb test case for Bug #49164.
        ------------------------------------------------------------
        revno: 3351.14.91
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Mon 2010-05-10 16:24:33 +0300
        message:
          Make dict_index_stat_mutex[] static because it is only used in dict0dict.c
        ------------------------------------------------------------
        revno: 3351.14.90
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-05-05 15:05:55 +0300
        message:
          Re-enable ps_3innodb.
        ------------------------------------------------------------
        revno: 3351.14.89
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-05-05 14:50:11 +0300
        message:
          Document Bug #53256
        ------------------------------------------------------------
        revno: 3351.14.88
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-05-05 14:45:13 +0300
        message:
          Note the 1.0.7 release
        ------------------------------------------------------------
        revno: 3351.14.87
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-05-05 14:24:11 +0300
        message:
          row_merge_drop_temp_indexes(): Load the table via the dictionary cache.
          Allow multiple indexes to be dropped. (Bug #53256)
        ------------------------------------------------------------
        revno: 3351.14.86
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-05-05 13:44:25 +0300
        message:
          Factor out innodb_multi_update.test from innodb.test
        ------------------------------------------------------------
        revno: 3351.14.85
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-05-05 13:40:01 +0300
        message:
          Factor out innodb_multi_update.test from innodb.test
        ------------------------------------------------------------
        revno: 3351.14.84 [merge]
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-05-05 13:37:33 +0300
        message:
          Merge
            ------------------------------------------------------------
            revno: 3351.45.1
            committer: Jimmy Yang <jimmy.yang@oracle.com>
            branch nick: mysql-5.1
            timestamp: Wed 2010-05-05 03:02:19 -0700
            message:
              Update ChangeLog for bug fix of #53165
        ------------------------------------------------------------
        revno: 3351.14.83
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-05-05 13:05:07 +0300
        message:
          Add Valgrind diagnostics to track down Bug #38999.
        ------------------------------------------------------------
        revno: 3351.14.82
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-05-05 12:53:28 +0300
        message:
          Add Valgrind diagnostics to track down Bug #38999.
        ------------------------------------------------------------
        revno: 3351.14.81
        committer: Jimmy Yang <jimmy.yang@oracle.com>
        branch nick: mysql-5.1
        timestamp: Tue 2010-05-04 21:52:24 -0700
        message:
          Port fix for 53165 to InnoDB 5.1 plugin. The change buffering options
          are different in 5.1 comparing to that of 5.5, so a hand port is
          necessary to avoid wrong default option to be set by a simple
          branch merge.
        ------------------------------------------------------------
        revno: 3351.14.80
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-05-04 16:15:17 +0300
        message:
          Document Bug #53306 in the InnoDB Plugin ChangeLog.
        ------------------------------------------------------------
        revno: 3351.14.79
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-05-04 16:13:58 +0300
        message:
          fsp_init_file_page_low(): Zero out the page. (Bug #53306)
        ------------------------------------------------------------
        revno: 3351.14.78
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-05-04 16:09:17 +0300
        message:
          fsp_init_file_page_low(): Zero out the page. (Bug #53306)
        ------------------------------------------------------------
        revno: 3351.14.77
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-05-04 15:55:10 +0300
        message:
          Add Valgrind checks to catch uninitialized writes to data files.
          buf_flush_insert_into_flush_list(),
          buf_flush_insert_sorted_into_flush_list(),
          buf_flush_post_to_doublewrite_buf(): Check that the page is initialized.
        ------------------------------------------------------------
        revno: 3351.14.76
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-05-04 15:47:44 +0300
        message:
          Add Valgrind checks to catch uninitialized writes to data files.
          buf_flush_insert_into_flush_list(),
          buf_flush_insert_sorted_into_flush_list(),
          buf_flush_post_to_doublewrite_buf(): Check that the page is initialized.
        ------------------------------------------------------------
        revno: 3351.14.75
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-05-04 13:55:46 +0300
        message:
          Remove UNIV_BTR_AVOID_COPY. It was broken because btr_attach_half_pages()
          would get the block, new_block in the wrong order.
          Fixing that would have complicated the function even further
          for this marginal case.
    ------------------------------------------------------------
    revno: 3370.2.3 [merge]
    author: hery.ramilison@oracle.com
    committer: MySQL Build Team<build@mysql.com>
    branch nick: mysql-5.1
    timestamp: Thu 2010-05-20 01:33:57 +0200
    message:
      Merge from mysql-5.1.47-release
        ------------------------------------------------------------
        revno: 3370.3.1 [merge]
        tags: mysql-5.1.47
        committer: Karen Langford <karen.langford@oracle.com>
        branch nick: mysql-5.1.47-release
        timestamp: Thu 2010-05-06 17:14:10 +0200
        message:
          Merge
            ------------------------------------------------------------
            revno: 3351.14.74
            committer: Marko M?kel? <marko.makela@oracle.com>
            branch nick: 5.1-innodb
            timestamp: Tue 2010-05-04 12:31:28 +0300
            message:
              btr_page_split_and_insert(): Correct the fix of Bug #52964.
              When split_rec==NULL, choose the correct node pointer key (first_rec).
            ------------------------------------------------------------
            revno: 3351.14.73
            committer: Marko M?kel? <marko.makela@oracle.com>
            branch nick: 5.1-innodb
            timestamp: Mon 2010-05-03 15:28:59 +0300
            message:
              buf_zip_decompress(): Allow BUF_NO_CHECKSUM_MAGIC as the stamped checksum.
              buf_page_get_gen(): Assert that buf_zip_decompress() succeeds.
              Callers are not prepared for a NULL return value. (Bug #53248)
