1. 07 Feb, 2007 1 commit
    • marko's avatar
      Merge changes from MySQL AB: · 95ad47ac
      marko authored
      ChangeSet
        2007/01/22 18:42:52+02:00 monty@mysql.com 
        Give warnings for unused objects
        Changed error message to be compatible with old error file
        Added new error message for new DUP_ENTRY syntax
      
      mysql-test/t/innodb.test
        2007/01/22 18:42:49+02:00 monty@mysql.com +14 -14
        Changed to use new error message
      95ad47ac
  2. 02 Feb, 2007 2 commits
    • marko's avatar
      Merge changes from MySQL AB: · e622cb93
      marko authored
      Rename some FIELD_TYPE_ constants to MYSQL_TYPE_.
      
      Change the scope of a type cast of two dividends.
      e622cb93
    • marko's avatar
      Rename hash_create to hash0_create by a #define. This fixes a · cd462019
      marko authored
      symbol collision when building PHP with IMAP and MySQL (Bug #13859).
      The bug was originally fixed by MySQL in a more obtrusive way, by
      replacing all occurrences of hash_create with hash0_create.  This
      change was applied to the MySQL tree as follows:
      
      ChangeSet@1.1616.2924.6, 2007-01-11 12:31:52+01:00, kent@mysql.com +9 -0
        Many files:
          Reverted change for bug#13859, applied smaller patch from Marko
      cd462019
  3. 24 Jan, 2007 1 commit
  4. 22 Jan, 2007 1 commit
  5. 19 Jan, 2007 1 commit
    • marko's avatar
      Add ut_ad() debug assertions. · 0a36f900
      marko authored
      UT_LIST_ADD_FIRST(), UT_LIST_ADD_LAST(), UT_LIST_INSERT_AFTER():
      Assert against some trivial cases of cyclic lists.
      
      mutex_enter_func(): Assert that the current thread is not holding the mutex.
      0a36f900
  6. 18 Jan, 2007 2 commits
  7. 12 Jan, 2007 1 commit
  8. 11 Jan, 2007 3 commits
    • osku's avatar
      Change this in ha_innobase: · 12b80747
      osku authored
       void*           innobase_prebuilt;
      
      to this:
      
       row_prebuilt_t* prebuilt;
      
      by introducing the typedef in ha_innodb.h, and remove all the now needless
      local variables and casts in ha_innodb.cc.
      12b80747
    • osku's avatar
      Apply patch from MySQL: · 03b9c45e
      osku authored
       ChangeSet@1.2353, 2006-12-19 16:57:51-07:00, tsmith@siva.hindu.god +13 -0
         Added innodb_rollback_on_timeout option to restore the 4.1 
         InnoDB timeout behavior (Bug #24200)
      03b9c45e
    • marko's avatar
      Merge a change from MySQL AB: · 79b0e5d2
      marko authored
      ChangeSet@1.2372, 2006-12-31 02:29:11+01:00, kent@mysql.com +79 -0
        Many files:
          Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
          Adjusted year(s) in copyright header 
          Added GPL copyright text
      79b0e5d2
  9. 09 Jan, 2007 1 commit
    • marko's avatar
      dict_load_foreign(): Use a local variable instead of the 10-bit field · 80d14b8e
      marko authored
      foreign->n_fields in order to preserve ON UPDATE CASCADE and
      ON DELETE CASCADE flags.  For some reason, gcc does not warn about
      shifting a 10-bit field to right by 24 bits.  (Bug #24741)
      
      This bug was introduced while reducing the memory footprint of the
      InnoDB data dictionary (Bug #20877).
      
      innodb.test, innodb.result: Add a test case.
      80d14b8e
  10. 02 Jan, 2007 2 commits
  11. 22 Dec, 2006 1 commit
  12. 15 Dec, 2006 1 commit
  13. 12 Dec, 2006 1 commit
  14. 07 Dec, 2006 1 commit
  15. 01 Dec, 2006 1 commit
  16. 30 Nov, 2006 1 commit
  17. 29 Nov, 2006 2 commits
  18. 28 Nov, 2006 2 commits
    • heikki's avatar
      Merge r1079 from branches/5.0: · 72cd01cf
      heikki authored
      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.
      72cd01cf
    • heikki's avatar
      Merge r1067:1077 from branches/5.0: · aee19a93
      heikki authored
      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.
      aee19a93
  19. 27 Nov, 2006 3 commits
  20. 23 Nov, 2006 4 commits
    • heikki's avatar
      Merge r1048:1050 from branches/5.0: · a586a909
      heikki authored
      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).
      a586a909
    • heikki's avatar
      Merge r1048 from branches/5.0: · 9d69ac3d
      heikki authored
      trx_rollback_for_mysql(): Do not set trx->sess back to NULL.
      This bug was introduced in r1046.
      9d69ac3d
    • heikki's avatar
      Merge r1046 from branches/5.0: · 14695b0c
      heikki authored
      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)
      14695b0c
    • marko's avatar
      buf_page_init_for_read(): Correct the indentation. · f451c0b3
      marko authored
      f451c0b3
  21. 21 Nov, 2006 3 commits
  22. 16 Nov, 2006 1 commit
    • marko's avatar
      Merge a change from MySQL AB. · 0fb091df
      marko authored
      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
      0fb091df
  23. 10 Nov, 2006 2 commits
  24. 09 Nov, 2006 2 commits