1. 20 Dec, 2006 11 commits
  2. 19 Dec, 2006 5 commits
    • unknown's avatar
      Added innodb_rollback_on_timeout option to restore the 4.1 · 20e9b490
      unknown authored
      InnoDB timeout behavior (Bug #24200)
      
      
      mysql-test/t/innodb_mysql-master.opt:
        Set --innodb-lock-wait-timeout=2, since test for bug #24200 times out.
        
        This *could* cause random test failures if some long-running transaction concurrency is being tested.  However, such a test really should go in innodb-big or some other test file.
      20e9b490
    • unknown's avatar
      Bug #24947: REPEAT function returns NULL when passed a field as the count parameter · 6cbf31ff
      unknown authored
      Handling of large signed/unsigned values was not consistent, so some string functions could return bogus results.
      The current fix is to simply patch up the val_str() methods for those string items.
      It would be good clean this code up in general, to make similar problems much harder to make.  This is left as an exercise for the reader.
      
      
      mysql-test/r/func_str.result:
        Update test results for bug #24947
      mysql-test/t/func_str.test:
        Add test case for bug #24947
      sql/item_strfunc.cc:
        Adjust some string function Items' val_str() methods to handle large signed/unsigned arguments properly
      6cbf31ff
    • unknown's avatar
      Merge mysql.com:/data0/mysqldev/my/mysql-5.0-release · 4cf2b8e1
      unknown authored
      into  mysql.com:/data0/mysqldev/my/build-200612151202-5.0.32/mysql-5.0-release
      
      
      sql/ha_innodb.cc:
        Auto merged
      4cf2b8e1
    • unknown's avatar
      Merge siva.hindu.god:/usr/home/tim/m/bk/50-release · 69b79a09
      unknown authored
      into  siva.hindu.god:/usr/home/tim/m/bk/50-build
      
      
      sql/ha_innodb.cc:
        Auto merged
      69b79a09
    • unknown's avatar
      This ChangeSet must be null-merged to 5.1. · 95049229
      unknown authored
      Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
      
      Bugs fixed:
      - Bug #21468: InnoDB crash during recovery with corrupted data pages: XA bug?
      - Bug #24299: Identifiers in foreign keys cannot contain U+0160, U+0360, ..., U+FF60
      - Bug #24386: Performance degradation caused by instrumentation in mutex_struct
      - Bug #24712: SHOW TABLE STATUS for file-per-table showing incorrect time fields
      
      
      innobase/dict/dict0dict.c:
        Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
        
        Revision r1030:
        branches/5.0: Replace isspace() with a wrapper ib_isspace(), because on
        Win32 isspace(0xa0) appears to hold.  (Bug #24299)
      innobase/include/sync0rw.h:
        Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
        
        Revision r1040:
        branches/5.0: Port r1039 from trunk:
        
        Port r1034 from branches/zip: Remove some instrumentation and reduce
        the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
      innobase/include/sync0sync.h:
        Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
        
        Revision r1040:
        branches/5.0: Port r1039 from trunk:
        
        Port r1034 from branches/zip: Remove some instrumentation and reduce
        the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
      innobase/include/sync0sync.ic:
        Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
        
        Revision r1040:
        branches/5.0: Port r1039 from trunk:
        
        Port r1034 from branches/zip: Remove some instrumentation and reduce
        the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
      innobase/log/log0recv.c:
        Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
        
        Revision r1076:
        branches/5.0: Remove the unintentionally committed change to univ.i in r1075.
        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 r1079:
        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.
      innobase/srv/srv0start.c:
        Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
        
        Revision r1075:
        branches/5.0: 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 r1077:
        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.
      innobase/sync/sync0rw.c:
        Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
        
        Revision r1040:
        branches/5.0: Port r1039 from trunk:
        
        Port r1034 from branches/zip: Remove some instrumentation and reduce
        the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
      innobase/sync/sync0sync.c:
        Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
        
        Revision r1040:
        branches/5.0: Port r1039 from trunk:
        
        Port r1034 from branches/zip: Remove some instrumentation and reduce
        the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
      innobase/trx/trx0roll.c:
        Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
        
        Revision r1067:
        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 r1050:
        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).
        
        
        Revision r1048:
        branches/5.0: trx_rollback_for_mysql(): Do not set trx->sess back to NULL.
        This bug was introduced in r1046.
        
        
        Revision r1046:
        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)
      innobase/trx/trx0trx.c:
        Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
        
        Revision r1067:
        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 r1050:
        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).
      sql/ha_innodb.cc:
        Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
        
        Revision r1040:
        branches/5.0: Port r1039 from trunk:
        
        Port r1034 from branches/zip: Remove some instrumentation and reduce
        the output of SHOW MUTEX STATUS in non-debug builds.  (Bug #24386)
        
        
        Revision r1099:
        branches/5.0: Merge revision 1098 from trunk: Fix bug #24712: SHOW TABLE
        STATUS for file-per-table showing incorrect time fields
      95049229
  3. 18 Dec, 2006 6 commits
  4. 15 Dec, 2006 5 commits
  5. 14 Dec, 2006 9 commits
  6. 12 Dec, 2006 4 commits