1. 14 Jan, 2007 2 commits
  2. 13 Jan, 2007 1 commit
  3. 12 Jan, 2007 1 commit
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl · bb484726
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
      
      
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      configure.in:
        Auto merged
      include/config-win.h:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      libmysqld/CMakeLists.txt:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/rpl_row_tabledefs_2myisam.result:
        Auto merged
      mysql-test/r/rpl_row_tabledefs_3innodb.result:
        Auto merged
      mysql-test/r/rpl_sp.result:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      mysys/my_thr_init.c:
        Auto merged
      sql/CMakeLists.txt:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_create.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log.h:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/rpl_injector.cc:
        Auto merged
      sql/rpl_injector.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_locale.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      unittest/mysys/my_atomic-t.c:
        Auto merged
      sql/log_event.cc:
        Manual merge main->rpl
      sql/mysqld.cc:
        Manual merge main->rpl
      bb484726
  4. 11 Jan, 2007 8 commits
    • unknown's avatar
      Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 84e89916
      unknown authored
      into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build
      
      
      configure.in:
        Auto merged
      mysql-test/install_test_db.sh:
        Auto merged
      BitKeeper/deleted/.del-CMakeLists.txt~3:
        Auto merged
      BitKeeper/deleted/.del-configure.js:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      84e89916
    • unknown's avatar
      Bug #24998 rpl_row_delayed_ins.test fails in pushbuild · 7133bbca
      unknown authored
      The test uses show binlog event which is not deterministic due to the single insert delayed
      query can generate up to number of inserted rows row-events pair (table_map + Write_row)
      
      The solution is to leave the current binlogging behaviour as it is and change 
      the test as spliting arguments of insert delayed query. Note, that such fix was applied
      earlier for  binlog_insert_delayed.test :
      https://intranet.mysql.com/secure/apps/irclog.php?channel=22&start_time=2006-09-27 
      
      There are no tests with insert delayed and show binlog events combination requiring
      this fix.
      
      
      mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test:
        splitting insert delayed per rows
      7133bbca
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mysql-5.0-build · 44318bbb
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mysql-5.1-build
      
      
      BitKeeper/deleted/.del-CMakeLists.txt~3:
        Auto merged
      BitKeeper/deleted/.del-README~1:
        Auto merged
      BitKeeper/deleted/.del-configure.js:
        Auto merged
      BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      configure.in:
        Manual merge
      mysql-test/install_test_db.sh:
        Manual merge
      sql/mysqld.cc:
        Manual merge
      44318bbb
    • unknown's avatar
      Merge trift2.:/MySQL/M50/tmp-5.0 · e64f4fde
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      mysys/my_read.c:
        Auto merged
      BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
        Auto merged
      BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
        Null merge.
      BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
        Null merge.
      BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
        Null merge.
      BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
        Null merge.
      BitKeeper/deleted/.del-mysqlserver.dsp~d99cfb2d291e3785:
        Null merge.
      scripts/make_binary_distribution.sh:
        Null merge, this change is already suppressed in 4.1.
      support-files/MySQL-shared-compat.spec.sh:
        Null merge, this change is already suppressed in 4.1.
      e64f4fde
    • unknown's avatar
      Merge trift2.:/MySQL/M50/tmp1-5.0 · 98cd24b3
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Auto merged
      98cd24b3
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · 32c535e2
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      32c535e2
    • unknown's avatar
      Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · ff9c3500
      unknown authored
      into  suse.vabb.com:/home/Chuck/development/mysql-5.1-new-rpl
      
      
      ff9c3500
    • unknown's avatar
      Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sage · 50361d9a
      unknown authored
      into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0
      
      
      configure.in:
        Auto merged
      mysql-test/install_test_db.sh:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      sql/CMakeLists.txt:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      win/configure.js:
        Auto merged
      50361d9a
  5. 10 Jan, 2007 7 commits
    • unknown's avatar
      BUG#22645 - LC_TIME_NAMES: Statement not replicated · 5ee39cb6
      unknown authored
      This patch is an additional code change to the get_str_len_and_pointer 
      method in log_events.cc. This change is necessary to correct a problem
      encountered on 64-bit SUSE where the auto_increment_* variables were
      being overwritten. The change corrects a cast mismatch which caused
      the problem.
      
      
      sql/log_event.cc:
        BUG#22645 - LC_TIME_NAMES: Statement not replicated
        This patch is an additional code change to the get_str_len_and_pointer,
        copy_str_and_move methods and the Query_leg_event constructor to 
        correct a type mismatch encountered during testing on SUSE 64-bit. The patch changes
        the data type of the buffer variables was changed to a new typedef 
        defined in the Log_event class. The new type is:
        
        typedef unsigned char Byte; 
        
        The variables changed include:
        
        pos, start, end, and data_buf
      sql/log_event.h:
        This patch adds a new type definition to the Log_event class. The new
        type is typedef unsigned char Byte. It is used in place of the uchar
        and usigned char definitions in the Query_log_event constructor to 
        eliminate type conversion problems encountere on SUSE 64-bit.
      5ee39cb6
    • unknown's avatar
      configure.in: · a4817ace
      unknown authored
        Corrected default for --disable-grant-options
      
      
      configure.in:
        Corrected default for --disable-grant-options
      a4817ace
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0 · c11c3b08
      unknown authored
      into  mysql.com:/d2/hf/mr10/my50-mr10
      
      
      c11c3b08
    • unknown's avatar
      configure.in: · 4ffd49d3
      unknown authored
        Removed line accidently inserted when correcting bug#18526
      
      
      configure.in:
        Removed line accidently inserted when correcting bug#18526
      4ffd49d3
    • unknown's avatar
      Merge mysql.com:/d2/hf/common/my51-common · bd27fcf8
      unknown authored
      into  mysql.com:/d2/hf/mr10/my51-mr10
      
      
      mysql-test/t/csv.test:
        Auto merged
      bd27fcf8
    • unknown's avatar
      Merge mysql.com:/d2/hf/common/my50-common · 380ad35c
      unknown authored
      into  mysql.com:/d2/hf/mr10/my50-mr10
      
      
      380ad35c
    • unknown's avatar
      WL #3670: Compile-time option to remove GRANT-related startup options · c2e9a4af
      unknown authored
      - configure --disable-grant-options defines DISABLE_GRANT_OPTIONS
      - configure.js/cmake also updated
      - if DISABLE_GRANT_OPTIONS is defined, mysqld no longer recognizes:
        --bootstrap
        --init-file
        --skip-grant-tables
      
      Scripts which rely on those three options are modified to check the environment for MYSQLD_BOOTSTRAP; it should be set to the full path of a mysqld which does handle those options.
      
      For example:
      
      $ export MYSQLD_BOOTSTRAP
      $ MYSQLD_BOOTSTRAP=/path/to/full/MySQL/bin/mysqld
      $ mysql_install_db
      $ make test
      
      
      configure.in:
        WL#3670
        
        Add --disable-grant-options
      mysql-test/install_test_db.sh:
        Add MYSQLD_BOOTSTRAP env variable, to enable test suite to work even if mysqld does not accept --bootstrap or --skip-grant-tables.
      mysql-test/mysql-test-run.pl:
        Add MYSQLD_BOOTSTRAP env variable, to enable test suite to work even if mysqld does not accept --bootstrap or --skip-grant-tables.
      mysql-test/mysql_test_run_new.c:
        Mention need for MYSQLD_BOOTSTRAP in a comment, in case this needs to be used with a mysqld which does not accept the --bootstrap option.
      scripts/mysql_install_db.sh:
        Add MYSQLD_BOOTSTRAP env variable, to enable mysqld_install_db to work even if mysqld does not accept --bootstrap or --skip-grant-tables.
      sql/CMakeLists.txt:
        Add DISABLE_GRANT_OPTIONS define
      sql/mysqld.cc:
        Add DISABLE_GRANT_OPTIONS define, which removes the --bootstrap, --init-file, and --skip-grant-tables options
      win/README:
        Document the DISABLE_GRANT_OPTIONS define
      win/configure.js:
        Handle DISABLE_GRANT_OPTIONS
      c2e9a4af
  6. 09 Jan, 2007 9 commits
  7. 08 Jan, 2007 5 commits
    • unknown's avatar
      Manual merge of the fix for BUG#19725 "Calls to SF in other database are not replicated · e1b0f07c
      unknown authored
      correctly in some cases", from 5.0.
      In short, calls to a stored function located in another database
      than the default database, may fail to replicate if the call was made
      by SET, SELECT, or DO.
      sp_head.cc automerged, only the test and test's result had to be hand-merged.
      
      
      mysql-test/r/rpl_sp.result:
        manual merge of the result of the test for BUG#19725
      mysql-test/r/rpl_switch_stm_row_mixed.result:
        the bugfix changes results as expected
      mysql-test/t/rpl_sp.test:
        manual merge of the test for BUG#19725
      e1b0f07c
    • unknown's avatar
      Merge gbichot3.local:/home/mysql_src/mysql-5.0-rpl-19725 · d101463e
      unknown authored
      into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-19725
      
      
      sql/sp_head.cc:
        Auto merged
      mysql-test/r/rpl_sp.result:
        using 5.1's version, will merge by hand after running the new test
      mysql-test/t/rpl_sp.test:
        using 5.1's version, will re-insert the new test portion by hand
      d101463e
    • unknown's avatar
      Fix for BUG#19725 "Calls to SF in other database are not replicated · 3a05847a
      unknown authored
      correctly in some cases".
      In short, calls to a stored function located in another database
      than the default database, may fail to replicate if the call was made
      by SET, SELECT, or DO.
      Longer: when a stored function is called from a statement which does not go
      to binlog ("SET @A=somedb.myfunc()", "SELECT somedb.myfunc()",
      "DO somedb.myfunc()"), this crafted statement is binlogged:
      "SELECT myfunc();" (accompanied with a mention of the default database
      if there is one). So, if "somedb" is not the default database,
      the slave would fail to find myfunc(). The fix is to specify the
      function's database name in the crafted binlogged statement, like this:
      "SELECT somedb.myfunc();". Test added in rpl_sp.test.
      
      
      mysql-test/r/rpl_sp.result:
        Because I moved the SHOW BINLOG EVENTS down a bit, big portions of its
        output move. Also, the function's database name appears in
        SELECT statements.
      mysql-test/t/rpl_sp.test:
        Adding test for BUG#19725.
        Moving the SHOW BINLOG EVENTS down, it is run at the very end to
        test everything.
      sql/sp_head.cc:
        When binlogging a "SELECT myfunc()" (when a stored function is executed
        inside a statement which does not go to the binlog (like a SET,
        SELECT, DO), we need to write "SELECT db_of_myfunc().myfunc()",
        because the function may be in a database which is not the default
        database.
      3a05847a
    • unknown's avatar
      Changes necessary to build version 4.0.28: · e6e7d0cf
      unknown authored
      - "make_binary_distribution" accepts a dummy "--platform=" argument.
      
      - "MySQL-shared-compat.spec" uses a "version40" define symbol internally.
      
      
      scripts/make_binary_distribution.sh:
        Newer versions of the release build tools call this with a "--platform=" argument
        which we seem not to need in 4.0, but which makes the tool crash (happened on SCO).
        
        Rather than add another version check into the build tools, just accept a "--platform="
        argument and ignore it, just give a message.
      support-files/MySQL-shared-compat.spec.sh:
        The current version of "Do-shared-compat" needs two digits to identify the release families
        (to differ between 4.0 and 4.1), so the variable "version4" must get renamed to "version40".
      e6e7d0cf
    • unknown's avatar
      Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.1 · d7c7060d
      unknown authored
      into  thorsen-consulting.dk:/Users/mmj/bktrees/mysql-5.1-build
      
      
      d7c7060d
  8. 06 Jan, 2007 2 commits
  9. 05 Jan, 2007 5 commits
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/inno/jan04/51 · 0e415583
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/51-build
      
      
      storage/innobase/buf/buf0buf.c:
        Auto merged
      storage/innobase/dict/dict0dict.c:
        Auto merged
      storage/innobase/ha/ha0ha.c:
        Auto merged
      storage/innobase/ha/hash0hash.c:
        Auto merged
      storage/innobase/include/hash0hash.h:
        Auto merged
      storage/innobase/lock/lock0lock.c:
        Auto merged
      storage/innobase/log/log0recv.c:
        Auto merged
      0e415583
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · 0275fa0e
      unknown authored
      into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
      
      
      scripts/make_binary_distribution.sh:
        Auto merged
      support-files/mysql.spec.sh:
        - Put back "libmygcc.a", found no real reason it was removed.
        - Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
          correct "libgcc.a" path is returned for the 32/64 bit architecture.
      0275fa0e
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build · 6f3343ee
      unknown authored
      into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
      
      
      scripts/make_binary_distribution.sh:
        Auto merged
      6f3343ee
    • unknown's avatar
      mysql.spec.sh, make_binary_distribution.sh: · 7fb6aa34
      unknown authored
        Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
        correct "libgcc.a" path is returned for the 32/64 bit architecture
      
      
      scripts/make_binary_distribution.sh:
        Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
        correct "libgcc.a" path is returned for the 32/64 bit architecture
      support-files/mysql.spec.sh:
        Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
        correct "libgcc.a" path is returned for the 32/64 bit architecture
      7fb6aa34
    • unknown's avatar
      Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots. · a5868736
      unknown authored
      Fixes:
      - Bug #24712: SHOW TABLE STATUS for file-per-table showing incorrect time fields
      - Bug #24386: Performance degradation caused by instrumentation in mutex_struct
      - Bug #24190: many exportable definitions of field_in_record_is_null
      - Bug #21468: InnoDB crash during recovery with corrupted data pages: XA bug?
      
      
      storage/innobase/buf/buf0buf.c:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1045:
        buf_page_init_for_read(): Correct the indentation.
      storage/innobase/buf/buf0flu.c:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1038:
        Port r983 from branches/zip: Enclose some more debug code in
        #ifdef UNIV_SYNC_DEBUG to allow the code to be built
        with UNIV_DEBUG but without UNIV_SYNC_DEBUG.
      storage/innobase/dict/dict0dict.c:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1124:
        Unify dict_table_get_and_increment_handle_count() with dict_table_get() by
        adding a second parameter, adjust callers.
      storage/innobase/ha/ha0ha.c:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1039:
        Port r1034 from branches/zip: Remove some instrumentation and reduce
        the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
      storage/innobase/ha/hash0hash.c:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1039:
        Port r1034 from branches/zip: Remove some instrumentation and reduce
        the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
      storage/innobase/handler/ha_innodb.cc:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1028:
        Merge a change from MySQL AB.
        
        ChangeSet
          2006/11/10 17:22:43+02:00 aelkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi 
          Bug #24190  many exportable definitions of field_in_record_is_null
          
          mysql had several(2) exportable definitions of field_in_record_is_null function.
          
          Fixed with adding static.
        
        storage/innobase/handler/ha_innodb.cc
          2006/11/10 17:22:36+02:00 aelkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi +1 -1
          made static
        
        
        Revision r1008:
        Minor cleanup.
        
        ha_innobase::rnd_pos(): Use correct format in DBUG_PRINT statements.
        
        buf_page_release(): Remove the local variable buf_fix_count.
        
        
        Revision r1039:
        Port r1034 from branches/zip: Remove some instrumentation and reduce
        the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
        
        
        Revision r1124:
        Unify dict_table_get_and_increment_handle_count() with dict_table_get() by
        adding a second parameter, adjust callers.
        
        Revision r1134:
        Fix a potential bug in ha_innodb.cc:innobase_query_is_update() where the
        function can be called with "current_thd == NULL". Minor non-functional fix
        in log0recv.c
        
        
        Revision r1098:
        Fix bug #24712: SHOW TABLE STATUS for file-per-table showing incorrect
        time fields
        
        
        Revision r1109:
        ha_innodb.cc: Remove unused define MAX_ULONG_BIT.
      storage/innobase/include/btr0sea.h:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1088:
        Replace the Latin abbreviation "cf." in comments.
      storage/innobase/include/buf0buf.ic:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1008:
        Minor cleanup.
        
        ha_innobase::rnd_pos(): Use correct format in DBUG_PRINT statements.
        
        buf_page_release(): Remove the local variable buf_fix_count.
      storage/innobase/include/data0type.ic:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1088:
        Replace the Latin abbreviation "cf." in comments.
      storage/innobase/include/dict0dict.h:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1124:
        Unify dict_table_get_and_increment_handle_count() with dict_table_get() by
        adding a second parameter, adjust callers.
      storage/innobase/include/ha0ha.h:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1039:
        Port r1034 from branches/zip: Remove some instrumentation and reduce
        the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
      storage/innobase/include/hash0hash.h:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1039:
        Port r1034 from branches/zip: Remove some instrumentation and reduce
        the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
      storage/innobase/include/sync0rw.h:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1039:
        Port r1034 from branches/zip: Remove some instrumentation and reduce
        the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
      storage/innobase/include/sync0sync.h:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1038:
        Port r983 from branches/zip: Enclose some more debug code in
        #ifdef UNIV_SYNC_DEBUG to allow the code to be built
        with UNIV_DEBUG but without UNIV_SYNC_DEBUG.
        
        
        Revision r1037:
        Port r972 from branches/zip: Enclose some debug code in #ifdef UNIV_SYNC_DEBUG.
        The code was previously unused in non-debug builds.
        
        
        Revision r1039:
        Port r1034 from branches/zip: Remove some instrumentation and reduce
        the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
        
        
        Revision r1084:
        Remove the unused constants SYNC_INFINITE_TIME and SYNC_TIME_EXCEEDED.
      storage/innobase/include/sync0sync.ic:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1039:
        Port r1034 from branches/zip: Remove some instrumentation and reduce
        the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
      storage/innobase/include/univ.i:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1006:
        Introduce #define UNIV_LIST_DEBUG for enabling the debug code in
        UT_LIST_REMOVE_CLEAR().
        
        
        Revision r1088:
        Replace the Latin abbreviation "cf." in comments.
        
        
        Revision r1083:
        univ.i: Document the debug flags (UNIV_DEBUG et al).
      storage/innobase/include/ut0lst.h:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1006:
        Introduce #define UNIV_LIST_DEBUG for enabling the debug code in
        UT_LIST_REMOVE_CLEAR().
      storage/innobase/lock/lock0lock.c:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1009:
        Remove duplicate printing of row lock counts in SHOW INNODB STATUS, and in
        the remaining print, add a comma so it doesn't get combined with the heap
        size. Both problems were introduced in r383.
      storage/innobase/log/log0recv.c:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1134:
        Fix a potential bug in ha_innodb.cc:innobase_query_is_update() where the
        function can be called with "current_thd == NULL". Minor non-functional fix
        in log0recv.c
        
        
        Revision r1078:
        Merge r1067:1077 from branches/5.0:
        
        innobase_start_or_create_for_mysql(): Remove unnecessary delay now that
        we moved the setting sync_order_checks_on=TRUE to log0recv.c,
        to the start of the rollback phase in crash recovery.
        
        Fix assertion failure sync0sync.c line 1239
        (the latter ut_error in sync_thread_reset_level())
        in crash recovery when UNIV_SYNC_DEBUG is enabled.
        
        
        Revision r1080:
        Merge r1079 from branches/5.0:
        
        recv_recovery_from_checkpoint_finish(): Add 1 sec delay
        before switching on the sync order checks in crash recovery, so that
        file I/O threads have time to suspend themselves.
      storage/innobase/row/row0ins.c:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1124:
        Unify dict_table_get_and_increment_handle_count() with dict_table_get() by
        adding a second parameter, adjust callers.
      storage/innobase/row/row0sel.c:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1038:
        Port r983 from branches/zip: Enclose some more debug code in
        #ifdef UNIV_SYNC_DEBUG to allow the code to be built
        with UNIV_DEBUG but without UNIV_SYNC_DEBUG.
        
        
        Revision r1124:
        Unify dict_table_get_and_increment_handle_count() with dict_table_get() by
        adding a second parameter, adjust callers.
      storage/innobase/row/row0upd.c:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1124:
        Unify dict_table_get_and_increment_handle_count() with dict_table_get() by
        adding a second parameter, adjust callers.
      storage/innobase/srv/srv0start.c:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1038:
        Port r983 from branches/zip: Enclose some more debug code in
        #ifdef UNIV_SYNC_DEBUG to allow the code to be built
        with UNIV_DEBUG but without UNIV_SYNC_DEBUG.
        
        
        Revision r1078:
        Merge r1067:1077 from branches/5.0:
        
        innobase_start_or_create_for_mysql(): Remove unnecessary delay now that
        we moved the setting sync_order_checks_on=TRUE to log0recv.c,
        to the start of the rollback phase in crash recovery.
        
        Fix assertion failure sync0sync.c line 1239
        (the latter ut_error in sync_thread_reset_level())
        in crash recovery when UNIV_SYNC_DEBUG is enabled.
        
        
        Revision r1070:
        Remove another accidentally committed change to srv0start.c.
        The change was accidentally committed with the merge in r1068.
        This revision corresponds to r1051 with a properly merged
        r1067 of branches/5.0.
        
        
        Revision r1068:
        Merge r1067 from branches/5.0:
        
        trx_rollback_for_mysql(), trx_commit_for_mysql():
        Protect the creation of trx_dummy_sess with kernel_mutex.
        This error was introduced in r1046 and r1050.
        
        
        Revision r1069:
        Remove an accidentally committed change to srv0start.c.
        The change was accidentally committed with the merge in r1068.
      storage/innobase/sync/sync0rw.c:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1039:
        Port r1034 from branches/zip: Remove some instrumentation and reduce
        the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
      storage/innobase/sync/sync0sync.c:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1038:
        Port r983 from branches/zip: Enclose some more debug code in
        #ifdef UNIV_SYNC_DEBUG to allow the code to be built
        with UNIV_DEBUG but without UNIV_SYNC_DEBUG.
        
        
        Revision r1037:
        Port r972 from branches/zip: Enclose some debug code in #ifdef UNIV_SYNC_DEBUG.
        The code was previously unused in non-debug builds.
        
        
        Revision r1039:
        Port r1034 from branches/zip: Remove some instrumentation and reduce
        the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
      storage/innobase/trx/trx0roll.c:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1049:
        Merge r1048 from branches/5.0:
        
        trx_rollback_for_mysql(): Do not set trx->sess back to NULL.
        This bug was introduced in r1046.
        
        
        Revision r1047:
        Merge r1046 from branches/5.0:
        
        branches/5.0: trx_rollback_for_mysql(): Ensure that trx->sess is non-NULL
        when calling trx_general_rollback_for_mysql().  This removes a segmentation
        fault when rolling back a prepared transaction in XA recovery.  (Bug #21468)
        
        
        Revision r1068:
        Merge r1067 from branches/5.0:
        
        trx_rollback_for_mysql(), trx_commit_for_mysql():
        Protect the creation of trx_dummy_sess with kernel_mutex.
        This error was introduced in r1046 and r1050.
        
        
        Revision r1051:
        Merge r1050 from branches/5.0:
        
        trx_rollback_for_mysql(): Fix the comment introduced in r1046.
        
        trx_commit_for_mysql(): Use the dummy trx->sess also for committing a prepared
        transaction in XA recovery, just in case our code would need the session
        object also in that case (does not seem to need it right now).
      storage/innobase/trx/trx0trx.c:
        Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
        
        Revision r1009:
        Remove duplicate printing of row lock counts in SHOW INNODB STATUS, and in
        the remaining print, add a comma so it doesn't get combined with the heap
        size. Both problems were introduced in r383.
        
        Revision r1068:
        Merge r1067 from branches/5.0:
        
        trx_rollback_for_mysql(), trx_commit_for_mysql():
        Protect the creation of trx_dummy_sess with kernel_mutex.
        This error was introduced in r1046 and r1050.
        
        
        Revision r1051:
        Merge r1050 from branches/5.0:
        
        trx_rollback_for_mysql(): Fix the comment introduced in r1046.
        
        trx_commit_for_mysql(): Use the dummy trx->sess also for committing a prepared
        transaction in XA recovery, just in case our code would need the session
        object also in that case (does not seem to need it right now).
      a5868736