------------------------------------------------------------
revno: 3444
tags: clone-5.1.46-build
committer: Georgi Kodinov <joro@sun.com>
branch nick: merge-5.1-bugteam
timestamp: Tue 2010-04-06 10:56:11 +0300
message:
  merge
    ------------------------------------------------------------
    revno: 1810.3987.10
    committer: Georgi Kodinov <joro@sun.com>
    branch nick: merge-5.0-bugteam
    timestamp: Tue 2010-04-06 10:51:52 +0300
    message:
      merge
------------------------------------------------------------
revno: 3443
committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Mon 2010-04-05 16:10:26 +0500
message:
  Bug#52336 Segfault / crash in 5.1 copy_fields (param=0x9872980) at sql_select.cc:15355
  The problem is that we can not use make_cond_for_table().
  This function relies on used_tables() condition
  which is not set properly for subqueries.
  As result subquery is not filtered out.
  The fix is to use remove_eq_conds() function instead
  of make_cond_for_table() func. 'remove_eq_conds()'
  algorithm relies on const_item() value and it allows
  to handle subqueries in right way.
------------------------------------------------------------
revno: 3442
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.1-bugteam
timestamp: Sat 2010-04-03 00:30:22 +0400
message:
  Bug #40625: Concat fails on DOUBLE values in a Stored
              Procedure, while DECIMAL works
  
  Selecting of the CONCAT(...<SP variable>...) result into
  a user variable may return wrong data.
  
  
  Item_func_concat::val_str contains a number of memory
  allocation-saving tricks. One of them concatenates
  strings inplace inserting the value of one string
  at the beginning of the other string. However,
  this trick didn't care about strings those points
  to the same data buffer: this is possible when
  a CONCAT() parameter is a stored procedure variable -
  Item_sp_variable::val_str() uses the intermediate
  Item_sp_variable::str_value field, where it may
  store a reference to an external buffer.
  
  
  The Item_func_concat::val_str function has been
  modified to take into account val_str functions
  (such as Item_sp_variable::val_str) that return
  a pointer to an internal Item member variable
  that may reference to a buffer provided.
------------------------------------------------------------
revno: 3441
committer: Anurag Shekhar <anurag.shekhar@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Fri 2010-04-02 01:35:36 +0530
message:
  Bug #47904 Incorrect results w/ table subquery, derived SQs, and LEFT JOIN 
         on index
  
  'my_decimal' class has two members which can be used to access the 
  value. The member variable buf (inherited from parent class decimal_t) 
  is set to member variable buffer so that both are pointing to same value.
  
  Item_copy_decimal::copy() uses memcpy to clone 'my_decimal'. The member
  buffer is declared as an array and memcpy results in copying the values
  of the array, but the inherited member buf, which should be pointing at
  the begining of the array 'buffer' starts pointing to the begining of 
  buffer in original object (which is being cloned). Further updates on 
  'my_decimal' updates only the inherited member 'buf' but leaves 
  buffer unchanged.
  
  Later when the new object (which now holds a inconsistent value) is cloned
  again using proper cloning function 'my_decimal2decimal' the buf pointer
  is fixed resulting in loss of the current value.
  
  Using my_decimal2decimal instead of memcpy in Item_copy_decimal::copy()
  fixed this problem.
------------------------------------------------------------
revno: 3440
committer: Sergey Vojtovich <svoj@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2010-04-01 22:17:34 +0400
message:
  Merge fix for BUG40980 to mysql-5.1-bugteam.
    ------------------------------------------------------------
    revno: 3430.1.1
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam-bug40980
    timestamp: Thu 2010-04-01 18:49:02 +0400
    message:
      BUG#40980 - Drop table can remove another MyISAM table's
                  data and index files
      
      It was possible if DATA/INDEX DIRECTORY is pointing to
      symlinked MySQL data home directory.
      
      Do not allow to drop data/index files implicitly symlinked
      to data home directory. For such tables remove symlink only.
------------------------------------------------------------
revno: 3439
committer: Sergey Vojtovich <svoj@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2010-04-01 19:10:05 +0400
message:
  Merge innodb-zip-ss6900 to mysql-5.1-bugteam.
    ------------------------------------------------------------
    revno: 3435.1.117
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 17:02:01 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6900 | mmakela | 2010-03-29 13:54:57 +0300 (Mon, 29 Mar 2010) | 5 lines
      branches/zip: Merge c6899 from branches/innodb+:
      
      Add debug assertions to track down Bug #52360.
      hash_table_t::magic_n: Add HASH_TABLE_MAGIC_N checks, which were fully absent.
      ut_hash_ulint(): Assert table_size > 0 before division.
    ------------------------------------------------------------
    revno: 3435.1.116
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 17:01:43 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6897 | mmakela | 2010-03-29 11:36:19 +0300 (Mon, 29 Mar 2010) | 3 lines
      branches/zip: innodb_mutex_show_status(): Fix a condition
      that was accidentally negated in r6781, making SHOW ENGINE INNODB MUTEX STATUS
      display only locks with no OS waits.
    ------------------------------------------------------------
    revno: 3435.1.115
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 17:01:22 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6891 | vdimov | 2010-03-26 16:19:01 +0200 (Fri, 26 Mar 2010) | 5 lines
      Non-functional change: update copyright year to 2010 of the files
      that have been modified after 2010-01-01 according to svn.
      
      for f in $(svn log -v -r{2010-01-01}:HEAD |grep "^   M " |cut -b 16- |sort -u) ; do sed -i "" -E 's/(Copyright \(c\) [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done
    ------------------------------------------------------------
    revno: 3435.1.114
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 17:00:43 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6875 | vdimov | 2010-03-25 18:18:15 +0200 (Thu, 25 Mar 2010) | 4 lines
      branches/zip:
      
      Wrap line at 78 column in ChangeLog.
    ------------------------------------------------------------
    revno: 3435.1.113
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 17:00:23 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6874 | vdimov | 2010-03-25 17:17:52 +0200 (Thu, 25 Mar 2010) | 4 lines
      branches/zip:
      
      Wrap ChangeLog at 78th column
    ------------------------------------------------------------
    revno: 3435.1.112
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 17:00:03 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6873 | vdimov | 2010-03-25 17:06:56 +0200 (Thu, 25 Mar 2010) | 4 lines
      branches/zip:
      
      Use Bug#N instead of Bug #N to be consistent with the rest of the fil.
    ------------------------------------------------------------
    revno: 3435.1.111
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:59:41 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6872 | vdimov | 2010-03-25 17:03:17 +0200 (Thu, 25 Mar 2010) | 4 lines
      branches/zip:
      
      Fix ChangeLog - write only the bug title in bugs.mysql.com-related entires.
    ------------------------------------------------------------
    revno: 3435.1.110
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:58:34 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6871 | vdimov | 2010-03-25 16:39:44 +0200 (Thu, 25 Mar 2010) | 4 lines
      branches/zip:
      
      Whitespace fixup to be consistent with the rest of the file.
    ------------------------------------------------------------
    revno: 3435.1.109
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:58:02 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6868 | mmakela | 2010-03-25 13:03:08 +0200 (Thu, 25 Mar 2010) | 1 line
      branches/zip: page_validate(): Check the buf[] bounds.
    ------------------------------------------------------------
    revno: 3435.1.108
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:57:39 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6864 | mmakela | 2010-03-24 14:05:53 +0200 (Wed, 24 Mar 2010) | 1 line
      branches/zip: dtype_new_store_for_order_and_null_size(): Add ut_ad() on mtype.
    ------------------------------------------------------------
    revno: 3435.1.107
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:57:08 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6861 | vdimov | 2010-03-23 19:31:02 +0200 (Tue, 23 Mar 2010) | 36 lines
      branches/zip:
      
      Merge joerg@mysql.com-20100322150231-vdq0afbqtmbs6phy from BZR,
      
      Including univ.i before mysql/plugin.h is needed to avoid this
      compiler error:
      
      o  This is how gcc puts it:
      o  > > ccache /usr/local/gcc-4.3.2/bin/gcc -static-libgcc -DHAVE_CONFIG_H -I. -I../../include -I../../include -I../../include -I../../regex -I./include -I../../sql -I. -I../../zlib    -g -O3 -march=i686   -DUNIV_LINUX -MT libinnobase_a-trx0i_s.o -MD -MP -MF .deps/libinnobase_a-trx0i_s.Tpo -c -o libinnobase_a-trx0i_s.o `test -f 'trx/trx0i_s.c' || echo './'`trx/trx0i_s.c
      o  > > In file included from ./include/univ.i:114,
      o  > >                  from trx/trx0i_s.c:36:
      o  > > ../../include/my_pthread.h:628: error: expected ')' before '*' token
      o  > > In file included from ../../include/my_pthread.h:732,
      o  > >                  from ./include/univ.i:114,
      o  > >                  from trx/trx0i_s.c:36:
      o  > > ../../include/mysql/psi/mysql_thread.h:100: error: expected specifier-qualifier-list before 'pthread_rwlock_t'
      o  > > ../../include/mysql/psi/mysql_thread.h:116: error: expected specifier-qualifier-list before 'pthread_rwlock_t'
      o  > > ../../include/mysql/psi/mysql_thread.h: In function 'inline_mysql_rwlock_init':
      o  > > ../../include/mysql/psi/mysql_thread.h:711: error: 'mysql_rwlock_t' has no member named 'm_psi'
      o  > > ../../include/mysql/psi/mysql_thread.h:716: error: 'mysql_rwlock_t' has no member named 'm_rwlock'
      o  > > .... ((continued))
      o  
      o  Intel's icc gives slightly clearer messages:
      o  > > icc -static-intel -static-libgcc -DHAVE_CONFIG_H -I. -I../../include -I../../include -I../../include -I../../regex -I./include -I../../sql -I. -I../../zlib    -O3 -g -unroll2 -ip -mp -restrict -no-ftz -no-prefetch   -DUNIV_LINUX -MT libinnobase_a-trx0i_s.o -MD -MP -MF .deps/libinnobase_a-trx0i_s.Tpo -c -o libinnobase_a-trx0i_s.o `test -f 'trx/trx0i_s.c' || echo './'`trx/trx0i_s.c
      o  > > ../../include/my_pthread.h(628): error: identifier "pthread_rwlock_t" is undefined
      o  > >   extern int rw_pr_init(rw_pr_lock_t *);
      o  > >                         ^
      o  > > 
      o  > > ../../include/mysql/psi/mysql_thread.h(100): error: identifier "pthread_rwlock_t" is undefined
      o  > >     rw_lock_t m_rwlock;
      o  > >     ^
      o  > > 
      o  > > ../../include/mysql/psi/mysql_thread.h(116): error: identifier "pthread_rwlock_t" is undefined
      o  > >     rw_pr_lock_t m_prlock;
      o  > >     ^
    ------------------------------------------------------------
    revno: 3435.1.106
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:56:22 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6860 | jyang | 2010-03-23 18:20:36 +0200 (Tue, 23 Mar 2010) | 5 lines
      branches/zip: This is patch from Inaam that uses red-black tree
      to speed up insertions into the flush_list and thus the recovery
      process. The patch has been tested by Nokia.
    ------------------------------------------------------------
    revno: 3435.1.105
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:55:08 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6858 | mmakela | 2010-03-23 14:09:24 +0200 (Tue, 23 Mar 2010) | 1 line
      branches/zip: innodb_read_ahead_threshold: Add missing space to help string.
    ------------------------------------------------------------
    revno: 3435.1.104
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:54:42 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6857 | mmakela | 2010-03-23 14:07:53 +0200 (Tue, 23 Mar 2010) | 1 line
      branches/zip: innodb_change_buffering: Correct the documentation.
    ------------------------------------------------------------
    revno: 3435.1.103
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:54:22 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6853 | marko | 2010-03-22 13:35:29 +0200 (Mon, 22 Mar 2010) | 1 line
      branches/zip: mutex_own(), rw_lock_own(): Add attribute((warn_unused_result)).
    ------------------------------------------------------------
    revno: 3435.1.102
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:53:56 +0400
    message:
      Applying InnoDB snapshot, fixes BUG#52102.
      
      Detailed revision comments:
      
      r6840 | calvin | 2010-03-19 00:32:23 +0200 (Fri, 19 Mar 2010) | 6 lines
      branches/zip: Fix Bug #52102 InnoDB Plugin shows performance drop
      comparing to builtin InnoDB (Windows only).
      
      Disable Windows atomics by default.
      
      Approved by: Inaam
    ------------------------------------------------------------
    revno: 3435.1.101
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:52:37 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6830 | marko | 2010-03-18 09:48:18 +0200 (Thu, 18 Mar 2010) | 3 lines
      branches/zip: buf_page_peek_if_too_old(): Use 32-bit arithmetics
      when comparing the age of access_time to buf_LRU_old_threshold_ms.
      This fixes a bug on 64-bit systems.
    ------------------------------------------------------------
    revno: 3435.1.100
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:52:14 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6828 | calvin | 2010-03-17 17:16:38 +0200 (Wed, 17 Mar 2010) | 7 lines
      branches/zip: rename IB_HAVE_PAUSE_INSTRUCTION to
      HAVE_IB_PAUSE_INSTRUCTION in CMakeLists.txt.
      
      The rename was done as r5871, but CMakeLists.txt was
      forgotten. Also, add INNODB_RW_LOCKS_USE_ATOMICS to
      CMake.
    ------------------------------------------------------------
    revno: 3435.1.99
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:27:53 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6805 | inaam | 2010-03-11 23:15:17 +0200 (Thu, 11 Mar 2010) | 6 lines
      branches/zip issue#463
      
      Fixed compiler warning about uninitialized variable.
      
      Non-functional change.
    ------------------------------------------------------------
    revno: 3435.1.98
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:27:34 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6801 | marko | 2010-03-11 13:34:28 +0200 (Thu, 11 Mar 2010) | 2 lines
      branches/zip: mtr_memo_contains(): Relax the assertion of r6800,
      allowing mtr->state == MTR_COMMITTING.
    ------------------------------------------------------------
    revno: 3435.1.97
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:27:13 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6800 | marko | 2010-03-11 12:02:57 +0200 (Thu, 11 Mar 2010) | 1 line
      branches/zip: Add ut_ad(mtr->state == MTR_ACTIVE) to various places.
    ------------------------------------------------------------
    revno: 3435.1.96
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:22:36 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6799 | jyang | 2010-03-11 09:59:42 +0200 (Thu, 11 Mar 2010) | 5 lines
      branches/zip: Once change in bug #47621 merges into zip branch,
      zip only test innodb_bug44571 needs to be updated to reflect the
      column name change would be successful be done in InnoDB as well.
    ------------------------------------------------------------
    revno: 3435.1.95
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:21:00 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6798 | marko | 2010-03-11 09:53:01 +0200 (Thu, 11 Mar 2010) | 14 lines
      branches/zip: Fix and clarify the latching of some buf_block_t members.
      
      buf_block_t::check_index_page_at_flush: Note that this field is not
      protected by any mutex. Make it a separate field, not a bitfield that
      could share the machine word with other fields.
      
      buf_block_t::lock_hash_val: Note that this field is protected by
      buf_block_t::lock (or during block creation, by buf_pool_mutex and
      buf_block_t::mutex).
      
      buf_block_get_lock_hash_val(): Assert that block->lock is held by the
      current thread.
      
      Issue #465, rb://267 approved by Inaam Rana
    ------------------------------------------------------------
    revno: 3435.1.94
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:20:37 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6792 | marko | 2010-03-10 13:56:41 +0200 (Wed, 10 Mar 2010) | 1 line
      branches/zip: Copy tests from branches/5.1 that were lost in some merge.
      r6793 | marko | 2010-03-10 14:02:19 +0200 (Wed, 10 Mar 2010) | 60 lines
      branches/zip: Merge revisions 6669:6788 from branches/5.1:
      
        ------------------------------------------------------------------------
        r6774 | calvin | 2010-03-03 23:56:10 +0200 (Wed, 03 Mar 2010) | 2 lines
        Changed paths:
           M /branches/5.1/trx/trx0sys.c
      
        branches/5.1: fix bug#51653: outdated reference to set-variable
        Non functional change.
        ------------------------------------------------------------------------
        r6780 | vasil | 2010-03-08 19:13:20 +0200 (Mon, 08 Mar 2010) | 4 lines
        Changed paths:
           M /branches/5.1/plug.in
      
        branches/5.1:
      
        Whitespace fixup.
        ------------------------------------------------------------------------
        r6783 | jyang | 2010-03-09 17:54:14 +0200 (Tue, 09 Mar 2010) | 9 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
           M /branches/5.1/mysql-test/innodb_bug21704.result
           A /branches/5.1/mysql-test/innodb_bug47621.result
           A /branches/5.1/mysql-test/innodb_bug47621.test
      
        branches/5.1: Fix bug #47621 "MySQL and InnoDB data dictionaries
        will become out of sync when renaming columns". MySQL does not
        provide new column name information to storage engine to
        update the system table. To avoid column name mismatch, we shall
        just request a table copy for now.
      
        rb://246 approved by Marko.
        ------------------------------------------------------------------------
        r6785 | vasil | 2010-03-10 09:04:38 +0200 (Wed, 10 Mar 2010) | 11 lines
        Changed paths:
           M /branches/5.1/mysql-test/innodb_bug38231.test
      
        branches/5.1:
      
        Add the missing --reap statements in innodb_bug38231.test. Probably MySQL
        enforced the presence of those recently and the test started failing like:
      
          main.innodb_bug38231                     [ fail ]
                  Test ended at 2010-03-10 08:48:32
      
          CURRENT_TEST: main.innodb_bug38231
          mysqltest: At line 49: Cannot run query on connection between send and reap
        ------------------------------------------------------------------------
        r6788 | vasil | 2010-03-10 10:53:21 +0200 (Wed, 10 Mar 2010) | 8 lines
        Changed paths:
           M /branches/5.1/mysql-test/innodb_bug38231.test
      
        branches/5.1:
      
        In innodb_bug38231.test: replace the fragile sleep 0.2 that depends on timing
        with a more robust condition which waits for the TRUNCATE and LOCK commands
        to appear in information_schema.processlist. This could also break if there
        are other sessions executing the same SQL commands, but there are none during
        the execution of the mysql test.
        ------------------------------------------------------------------------
    ------------------------------------------------------------
    revno: 3435.1.93
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:15:15 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6791 | marko | 2010-03-10 13:39:06 +0200 (Wed, 10 Mar 2010) | 1 line
      branches/zip: Add ChangeLog entries for r6789, r6790.
    ------------------------------------------------------------
    revno: 3435.1.92
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:14:51 +0400
    message:
      Applying InnoDB snapshot, fixes BUG#51356.
      
      Detailed revision comments:
      
      r6790 | jyang | 2010-03-10 13:09:41 +0200 (Wed, 10 Mar 2010) | 7 lines
      branches/zip: Fix bug #51356: "many valgrind errors in error messages
      with concurrent ddl". Null terminate the name string returned
      from innobase_convert_identifier() call when reporting DB_DUPLICATE_KEY
      error in create_table_def().
      rb://266 approved by Marko
    ------------------------------------------------------------
    revno: 3435.1.91
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:12:44 +0400
    message:
      Applying InnoDB snapshot, fixes BUG#51378.
      
      Detailed revision comments:
      
      r6789 | jyang | 2010-03-10 11:18:18 +0200 (Wed, 10 Mar 2010) | 10 lines
      branches/zip: If a unique index is on a column prefix, such
      unique index cannot be upgrade to primary index even if there
      is no primary index already defined. Also fix possible corruption
      when initialize "ref_length" value in case there is a mismatch
      between MySQL and InnoDB primary key. Fix bug #51378: "Init
      'ref_length'  to correct value, in case an out of bound MySQL
      primary_key".
      rb://262 approved by Marko.
    ------------------------------------------------------------
    revno: 3435.1.90
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:07:58 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6787 | marko | 2010-03-10 10:35:06 +0200 (Wed, 10 Mar 2010) | 10 lines
      branches/zip: recv_parse_log_rec(): Remove a bogus assertion about page_no.
      TODO: We might also consider removing recv_max_parsed_page_no, because
      it does not make much sense with *.ibd files.
      
      recv_report_corrupt_log(), recv_scan_log_recs(): Abort when a
      corrupted log record has been found, unless innodb_force_recovery has
      been set.
      
      This fixes Issue #464.
      rb://265 approved by Heikki Tuuri
    ------------------------------------------------------------
    revno: 3435.1.89
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:07:40 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6786 | vasil | 2010-03-10 09:16:50 +0200 (Wed, 10 Mar 2010) | 4 lines
      branches/zip:
      
      Fix typo in comment
    ------------------------------------------------------------
    revno: 3435.1.88
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:07:16 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6782 | marko | 2010-03-09 14:09:26 +0200 (Tue, 09 Mar 2010) | 1 line
      branches/zip: fil0fil.c: Update comments on table->flags as of r6252.
    ------------------------------------------------------------
    revno: 3435.1.87
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:06:59 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6781 | marko | 2010-03-09 09:41:08 +0200 (Tue, 09 Mar 2010) | 4 lines
      branches/zip: Make SHOW ENGINE INNODB MUTEX display SUM(os_waits)
      for block mutexes and blocks.
      
      Designed by Michael and Marko. rb://188, Issue #358
    ------------------------------------------------------------
    revno: 3435.1.86
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:06:36 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6779 | marko | 2010-03-08 14:35:42 +0200 (Mon, 08 Mar 2010) | 6 lines
      branches/zip: Fix IMPORT TABLESPACE of compressed tables.  Previously,
      a wrong parameter was passed to buf_flush_init_for_writing().
      
      fil_reset_too_high_lsns(): Set up page_zip and use it if needed.
      
      rb://264, Issue #352
    ------------------------------------------------------------
    revno: 3435.1.85
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:06:16 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6777 | marko | 2010-03-04 13:01:25 +0200 (Thu, 04 Mar 2010) | 2 lines
      branches/zip: trx_undo_update_rec_get_update(): Silence a bogus GCC warning
      about a possibly uninitialized variable.
    ------------------------------------------------------------
    revno: 3435.1.84
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:05:52 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6773 | marko | 2010-03-03 15:31:54 +0200 (Wed, 03 Mar 2010) | 2 lines
      branches/zip: row_raw_format(): Silence a GCC 4.4.2 warning
      of possibly uninitialized variable format_in_hex.
    ------------------------------------------------------------
    revno: 3435.1.83
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:05:25 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6771 | marko | 2010-03-03 14:52:43 +0200 (Wed, 03 Mar 2010) | 1 line
      Document r6770.
    ------------------------------------------------------------
    revno: 3435.1.82
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:04:43 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6770 | marko | 2010-03-03 12:52:55 +0200 (Wed, 03 Mar 2010) | 12 lines
      branches/zip: Disallow duplicate index name when creating an index.
      This should fix Mantis Issue #461.
      
      innodb.test, innodb.result, innodb-index.test, innodb-index.result:
      Adjust the test result and mention that the introduced restriction
      has been reported as MySQL Bug #51451.
      
      innobase_check_index_keys(): Add a parameter for the InnoDB table and
      check that no duplicate index name is added.  Report errors by
      my_error() instead of sql_print_error().
      
      rb://260 approved by Sunny Bains
    ------------------------------------------------------------
    revno: 3435.1.81
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:02:34 +0400
    message:
      Applying InnoDB snapshot
      
      Detailed revision comments:
      
      r6768 | vasil | 2010-03-02 18:20:48 +0200 (Tue, 02 Mar 2010) | 5 lines
      branches/zip:
      
      Add a NOTE to the comment of btr_node_ptr_get_child_page_no()
      to prevent mysterious bugs.
    ------------------------------------------------------------
    revno: 3435.1.80
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:01:33 +0400
    message:
      Applying InnoDB snashot, fixes BUG#51587.
      
      Detailed revision comments:
      
      r6767 | calvin | 2010-03-01 18:16:10 +0200 (Mon, 01 Mar 2010) | 3 lines
      branches/zip: fix bug#51587
      Non-functional change.
    ------------------------------------------------------------
    revno: 3435.1.79
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:01:10 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6754 | marko | 2010-02-24 10:56:43 +0200 (Wed, 24 Feb 2010) | 17 lines
      branches/zip: Allocate the merge sort buffers from a heap, not stack.
      
      The merge sort can use up to 48KiB of buffers when merging blocks.
      That can cause a stack overflow, especially on 64-bit systems when not
      building with inlined functions.  This was reported as Issue #462.
      
      row_merge_dup_report(): Allocate buf and offsets from a heap.
      
      row_merge_heap_create(): Allocate space for buf[3] too. Fix bogus
      sizeof arithmetics that happened to work, because
      sizeof(ulint)==sizeof(void*).
      
      row_merge_blocks(), row_merge_blocks_copy(): Allocate buf[3] from heap.
      
      row_merge_insert_index_tuples(): Allocate buf from graph_heap.
      
      rb://258 approved and tested by Sunny Bains
    ------------------------------------------------------------
    revno: 3435.1.78
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 16:00:18 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6750 | marko | 2010-02-22 08:57:23 +0200 (Mon, 22 Feb 2010) | 2 lines
      branches/zip: row_fetch_store_uint4(): Remove unused function.
      This was added to trunk in r435.
    ------------------------------------------------------------
    revno: 3435.1.77
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 15:59:25 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6749 | vasil | 2010-02-20 18:45:41 +0200 (Sat, 20 Feb 2010) | 5 lines
      Non-functional change: update copyright year to 2010 of the files
      that have been modified after 2010-01-01 according to svn.
      
      for f in $(svn log -v -r{2010-01-01}:HEAD |grep "^   M " |cut -b 16- |sort -u) ; do sed -i "" -E 's/(Copyright \(c\) [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done
    ------------------------------------------------------------
    revno: 3435.1.76
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 15:58:48 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6740 | sunny | 2010-02-18 13:44:31 +0200 (Thu, 18 Feb 2010) | 6 lines
      branches/zip: Don't print the entire lock bit set if the block was not
      found in the buffer pool. Only print the bits that are set and that
      information is in the lock and not in the block.
      
      See rb://256 approved by Marko.
    ------------------------------------------------------------
    revno: 3435.1.75
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 15:58:26 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6728 | marko | 2010-02-17 18:54:04 +0200 (Wed, 17 Feb 2010) | 3 lines
      branches/zip: Remove UNIV_BASIC_LOG_DEBUG.
      This fixes the FILE_FLUSH_LSN printouts mentioned in Issue #341.
      Suggested by Heikki.
    ------------------------------------------------------------
    revno: 3435.1.74
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 15:58:03 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6727 | marko | 2010-02-17 18:50:20 +0200 (Wed, 17 Feb 2010) | 2 lines
      branches/zip: fsp_init_file_page_low(): Declare the page uninitialized
      for Valgrind.
    ------------------------------------------------------------
    revno: 3435.1.73
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 15:57:40 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6726 | marko | 2010-02-17 18:49:21 +0200 (Wed, 17 Feb 2010) | 3 lines
      branches/zip: FIL_PAGE_FILE_FLUSH_LSN: Note that the field is only valid
      for the first page of each ibdata* file, not *.ibd files.
      Suggested by Heikki, in connection with the LSN warning noted in Issue #341.
    ------------------------------------------------------------
    revno: 3435.1.72
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 15:57:04 +0400
    message:
      Applying InnoDB snapshot, fixes BUG#50691.
      
      Detailed revision comments:
      
      r6724 | marko | 2010-02-17 15:52:05 +0200 (Wed, 17 Feb 2010) | 11 lines
      branches/zip: Merge revisions 6613:6669 from branches/5.1:
        ------------------------------------------------------------------------
        r6669 | jyang | 2010-02-11 12:24:19 +0200 (Thu, 11 Feb 2010) | 7 lines
      
        branches/5.1: Fix bug #50691, AIX implementation of readdir_r
        causes InnoDB errors. readdir_r() returns an non-NULL value
        in the case of reaching the end of a directory. It should
        not be treated as an error return.
      
        rb://238 approved by Marko
        ------------------------------------------------------------------------
    ------------------------------------------------------------
    revno: 3435.1.71
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 15:56:38 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6723 | marko | 2010-02-17 11:48:34 +0200 (Wed, 17 Feb 2010) | 3 lines
      branches/zip: lock_table_other_has_incompatible():
      Return an incompatible lock or NULL instead of TRUE or FALSE.
      Approved by Sunny over IM.
    ------------------------------------------------------------
    revno: 3435.1.70
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 15:56:02 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6718 | marko | 2010-02-16 15:06:16 +0200 (Tue, 16 Feb 2010) | 1 line
      branches/zip: Fix a comment.
    ------------------------------------------------------------
    revno: 3435.1.69
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 15:55:42 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6717 | marko | 2010-02-16 14:53:20 +0200 (Tue, 16 Feb 2010) | 2 lines
      branches/zip: log_reserve_and_write_fast(): Correct a race condition
      in UNIV_LOG_LSN_DEBUG.  This could have caused Issue #440.
    ------------------------------------------------------------
    revno: 3435.1.68
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 15:55:20 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6715 | sunny | 2010-02-16 10:14:21 +0200 (Tue, 16 Feb 2010) | 1 line
      branches/zip: Fix comment. Non functional change.
    ------------------------------------------------------------
    revno: 3435.1.67
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 15:55:01 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6714 | sunny | 2010-02-16 10:12:25 +0200 (Tue, 16 Feb 2010) | 2 lines
      branches/zip: Update the comments and fix the whitespace issues.
      See rb://255 Approved by: Marko
    ------------------------------------------------------------
    revno: 3435.1.66
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 15:54:41 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6713 | sunny | 2010-02-16 10:12:17 +0200 (Tue, 16 Feb 2010) | 7 lines
      branches/zip: Change the bit fields back to ulint. Bit fields were causing
      problems with concurrency on SMP systems because of word packing issues.
      The number of trx_t's in a system is not sufficient enough to require that
      we try and save a few bytes in the data structure.
      
      See rb://255 for details.
    ------------------------------------------------------------
    revno: 3435.1.65
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 15:54:23 +0400
    message:
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6712 | marko | 2010-02-16 10:05:36 +0200 (Tue, 16 Feb 2010) | 2 lines
      branches/zip: trx_lists_init_at_db_start(): Assert that the kernel_mutex
      is held by the caller.
    ------------------------------------------------------------
    revno: 3435.1.64
    committer: Sergey Vojtovich <svoj@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2010-04-01 15:54:01 +0400
[--snip--]
