1. 01 Sep, 2006 2 commits
    • marko's avatar
      Merge a patch from MySQL AB: · 1ce2c0f8
      marko authored
      ChangeSet@1.2288, 2006-08-29 15:35:05+02:00, guilhem@gbichot3.local +2 -0
        Fix for BUG#20866 "show table status on innodb raises assertion"
        and its duplicate BUG#19057 "Test 'rpl_row_func003' fails on SuSE SLES9 x86".
        It was an assertion failure, only in debug builds, not present
        in released versions (nothing to document).
        It happened when doing SHOW TABLE STATUS on an InnoDB table
        having an auto_increment column, right after creating the table.
      
        sql/ha_innodb.cc@1.288, 2006-08-29 15:35:02+02:00, guilhem@gbichot3.local +7 -1
          Before a val_() calls on a Field object, if that field was not marked
          for read, we need to mark it. This is explained here:
          ChangeSet 1.2119.601.1 2006/06/04 18:52:22 monty@mysql.com
          quoting the changeset's comment:
          
            - If a handler needs to call Field->val() or Field->store() on columns
              that are not used in the query, one should install a temporary
              all-columns-used map while doing so. For this, we provide the following
              functions:
            
              my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
              field->val();
              dbug_tmp_restore_column_map(table->read_set, old_map);
            
              and similar for the write map:
            
              my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
              field->val();
              dbug_tmp_restore_column_map(table->write_set, old_map);
            
              If this is not done, you will sooner or later hit a DBUG_ASSERT
              in the field store() / val() functions.
              (For not DBUG binaries, the dbug_tmp_restore_column_map() and
              dbug_tmp_restore_column_map() are inline dummy functions and should
              be optimized away be the compiler).
          
          Note that I verified that the bug didn't exist in non-debug builds.
      1ce2c0f8
    • marko's avatar
      Revert the hunk on ha_innobase::innobase_read_and_init_auto_inc() · fb067e41
      marko authored
      that was accidentally committed in r782.
      fb067e41
  2. 31 Aug, 2006 6 commits
  3. 30 Aug, 2006 1 commit
    • marko's avatar
      Merge changes from MySQL AB: · 965a9416
      marko authored
      ChangeSet
        2006/08/23 13:59:16-07:00 brian@zim.(none) 
        This patch removes need for a innodb to have its own configure. 
      
      univ.i: Replace ../ib_config.h with config.h.
      
      Makefile.i, Makefile.am: Change directory paths.
      
      configure.in: Delete.
      
      plug.in: New file, included from the top-level configure.in.
      
      setup.sh: Replace configure.in with plug.in.
      965a9416
  4. 29 Aug, 2006 3 commits
  5. 28 Aug, 2006 3 commits
    • marko's avatar
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser · 8f18616e
      marko authored
      and lexer files).  From now on, the following Emacs cc-mode settings apply
      when indenting C function bodies in InnoDB:
      
      (setq c-basic-offset 8)
      (setq c-label-minimum-indentation 0)
      (add-to-list 'c-offsets-alist '(c . 0))
      (add-to-list 'c-offsets-alist '(label . [0]))
      
      The indentation rules for function declarations still have not been
      formalized, and they must be formatted manually.
      
      Try to limit all lines to at most 79 characters (assuming TAB stops every
      8 characters) by splitting lines before opening parenthesis, or at
      string constants.
      
      Fix some grammar mistakes in diagnostic output:
       match to, match with -> match
       found from -> found in
       trying rename -> trying to rename
      
      Fix an error in page_check_dir(): it said "supremum not pointed to"
      when the infimum was not pointed to.
      
      Enclose commented-out code snippets in #if 0 ... #endif instead of /* ... */.
      Add (void*) casts to some %p parameters in fprintf() calls.  Try to
      split lines before a binary operator, not after one.  (These three fixes
      were not made everywhere.)
      8f18616e
    • osku's avatar
      page_validate(): Add missing space to error print, for real this time, · bd338ceb
      osku authored
      following an error in r761.
      bd338ceb
    • osku's avatar
      btr_cur_search_to_nth_level(): Document where cursor is left at in · 66241d5a
      osku authored
      PAGE_CUR_LE searches.
      
      page_validate(): Add missing space to error print.
      66241d5a
  6. 22 Aug, 2006 1 commit
  7. 17 Aug, 2006 2 commits
  8. 16 Aug, 2006 1 commit
  9. 14 Aug, 2006 4 commits
  10. 11 Aug, 2006 5 commits
    • marko's avatar
    • marko's avatar
      ha_innobase::delete_all_rows(): Correct an error introduced in r705: · b0d9c363
      marko authored
      Replace the local variable "trx" with "prebuilt->trx".
      
      Also, replace the second invocation of the macro current_thd with
      the local variable thd.
      b0d9c363
    • marko's avatar
      Merge a change from MySQL AB: · 122ca353
      marko authored
      # ChangeSet
      #   2006/07/30 05:16:08+04:00 aivanov@mysql.com 
      #   Make innodb_thread_concurrency 0 by default.
      #    Fixing test result.
      # 
      # mysql-test/r/innodb.result
      #   2006/07/30 05:16:05+04:00 aivanov@mysql.com +1 -1
      #   Make innodb_thread_concurrency 0 by default.
      #    Fixing test result.
      122ca353
    • marko's avatar
      Merge a change from MySQL AB (originally implemented by Marko · b4270e70
      marko authored
      in the 5.0 tree and now merged to the 5.1 tree):
      
      # ChangeSet
      #   2006/07/29 07:17:33+04:00 aivanov@mysql.com 
      #   Make innodb_flush_log_at_trx_commit a settable global variable.
      # 
      # sql/ha_innodb.cc
      #   2006/07/29 07:17:29+04:00 aivanov@mysql.com +1 -3
      #   Remove innobase_flush_log_at_trx_commit
      #   (set srv_flush_log_at_trx_commit directly).
      # 
      # sql/ha_innodb.h
      #   2006/07/29 07:17:29+04:00 aivanov@mysql.com +1 -1
      #   Remove innobase_flush_log_at_trx_commit.
      #   Declare srv_flush_log_at_trx_commit.
      # 
      # storage/innobase/include/srv0srv.h
      #   2006/07/29 07:17:30+04:00 aivanov@mysql.com +1 -1
      #   Change the type of srv_flush_log_at_trx_commit.
      # 
      # storage/innobase/srv/srv0srv.c
      #   2006/07/29 07:17:30+04:00 aivanov@mysql.com +1 -1
      #   Change the type of srv_flush_log_at_trx_commit.
      # 
      b4270e70
    • marko's avatar
      Merge a change from MySQL AB: · 6389cd96
      marko authored
      # ChangeSet
      #   2006/07/28 21:27:01+04:00 sergefp@mysql.com 
      #   BUG#14940 "MySQL choose wrong index", v.2
      # mysql-test/r/innodb_gis.result
      #   2006/07/28 21:26:56+04:00 sergefp@mysql.com +15 -15
      #   BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column
      6389cd96
  11. 08 Aug, 2006 3 commits
  12. 07 Aug, 2006 3 commits
  13. 02 Aug, 2006 2 commits
  14. 01 Aug, 2006 1 commit
  15. 31 Jul, 2006 2 commits
  16. 28 Jul, 2006 1 commit