1. 14 Sep, 2006 5 commits
    • marko's avatar
      Remove dict_col_t::clust_pos. · 9ac21cde
      marko authored
      dict_col_get_clust_pos(): Add parameter clust_index.  Replace the
      look-up with a linear search of all columns in the clustered index.
      
      row_upd_index_replace_new_col_vals(): Compute clust_index outside
      the loops.  Compute clust_pos outside the inner loop.
      
      row_upd_changes_ord_field_binary(), row_upd_changes_first_fields_binary():
      Compute clust_index outside the loops.  Declare the auxiliary variables
      inside the loop scope.
      9ac21cde
    • marko's avatar
      dict_col_t: Reduce ord_part to one bit. · 4a1c7668
      marko authored
      dict_index_add_to_cache(): Instead of incrementing ord_part, set it.
      
      dict_index_remove_from_cache(): Do not touch ord_part.
      
      dtype_t: Reduce mbminlen from 3 to 2 bits.
      
      row_upd(): Add a UNIV_LIKELY hint around node->in_mysql_interface.
      4a1c7668
    • marko's avatar
      Remove dict_col_t::hash, dict_col_t::table, · e50acec9
      marko authored
      dict_sys->col_hash, and DICT_POOL_PER_COL_HASH.  (Bug #20877)
      
      The col->table pointer was only needed for maintaining a hash table of
      all defined columns in all tables.  The hash table was only looked up
      in dict_index_find_cols().  Removing the col->hash and col->table
      pointers reduces the size of a table column by two machine words
      (usually 8 or 16 bytes).
      
      dict_col_add_to_cache(), dict_col_reposition_in_cache(),
      dict_col_remove_from_cache(): Remove.  These only updated dict_sys->col_hash.
      
      dict_index_find_cols(): Use a linear search instead of the hash table.
      The time complexity is affected, but this function is only invoked by
      dict_index_add_to_cache(), and we only search the columns of a single
      table (typically at most a few dozen) as opposed to all columns of all
      tables.
      e50acec9
    • osku's avatar
      btr0pcur.h: Change FIXME to TODO. · 18df0db0
      osku authored
      18df0db0
    • osku's avatar
      Remove more remnants of mixed indexes. · 8b68f259
      osku authored
      8b68f259
  2. 13 Sep, 2006 2 commits
  3. 12 Sep, 2006 1 commit
    • marko's avatar
      Reduce the size of the data dictionary cache. (Bug #20877) · 0245fe4a
      marko authored
      dtype_t: Remove unused field "prec", which was supposed to be used for
      the precision of decimal columns in stand-alone InnoDB.
      
      dtype_get_prec(): Remove.
      
      dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
      
      dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
      into bit-fields.
      
      dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
      
      dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
      
      Replace the default clust_pos value ULINT_UNDEFINED with
      REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
      the accessor function dict_col_get_clust_pos().
      
      dict_field_t: Turn prefix_len and fixed_len into bit-fields.
      
      dict_tree_t: Remove pad[64].
      
      dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
      cached, flags, stat_initialized, and autoinc_inited into bit-fields.
      Remove does_not_fit_in_memory from non-debug builds.
      
      dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
      n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
      
      dict_foreign_struct: Turn n_fields and type into bit-fields.
      
      rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
      Omit level unless #defined UNIV_SYNC_DEBUG.
      
      Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
      from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
      dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.
      0245fe4a
  4. 11 Sep, 2006 2 commits
    • marko's avatar
      Merge code cleanup from MySQL AB: · db256d89
      marko authored
      ChangeSet
        2006/09/07 08:23:58-07:00 brian@zim.(none) 
        Moves Innodb handler to the Innodb storage directory.
      
      storage/innobase/handler/ha_innodb.cc
        2006/09/07 08:23:53-07:00 brian@zim.(none) +2 -3
        Adjusted include files, also disabled replication code which was not
        being used.
      
      ChangeSet
        2006/09/07 12:34:12-07:00 brian@zim.(none) 
        Fix for a compile problem in Windows. 
      
      storage/innobase/handler/ha_innodb.cc
        2006/09/07 12:34:10-07:00 brian@zim.(none) +0 -28
        Removed some dead code (Marko approved)
      db256d89
    • marko's avatar
      Move ha_innodb.cc and ha_innodb.h from sql to storage/innobase/handler. · 7cf4bf45
      marko authored
      This was submitted by Marko to MySQL AB and merged to the MySQL tree by
      Brian Aker in the following two changesets:
      
      ChangeSet
        2006/09/07 08:23:58-07:00 brian@zim.(none) 
        Moves Innodb handler to the Innodb storage directory.
      
      ChangeSet
        2006/09/07 16:17:16-07:00 brian@zim.(none) 
        Warning fixes for Windows, and an include fix for Windows for Innodb.
      
      storage/innobase/CMakeLists.txt
        2006/09/07 16:17:13-07:00 brian@zim.(none) +6 -1
        Fixed includes for Windows
      7cf4bf45
  5. 06 Sep, 2006 1 commit
    • marko's avatar
      On data tuples being updated or inserted (but not searched for), · 8a1caecc
      marko authored
      set type->len to the prefix_len of the index column, if it is a prefix index.
      This should prevent bugs similar to Bug #21638 from occurring.
      
      dict_index_copy_types(): Set type->len to prefix_len if prefix_len != 0.
      
      row_build_index_entry(): Set type->len to prefix_len if prefix_len != 0,
      also when the column in the tuple is SQL NULL, because the type information
      may be used for interpreting other records during btr_page_reorganize().
      8a1caecc
  6. 05 Sep, 2006 4 commits
  7. 04 Sep, 2006 4 commits
    • marko's avatar
    • marko's avatar
      Merge code from MySQL AB: · 97a199b3
      marko authored
      ChangeSet
        2006/08/25 13:31:15-07:00 brian@zim.(none) 
        Cleanup of unused variables.
      
      sql/ha_innodb.h
        2006/08/25 13:31:11-07:00 brian@zim.(none) +0 -6
        Unused variable
      97a199b3
    • marko's avatar
      Merge code from MySQL AB: · 489ada03
      marko authored
      ChangeSet
        2006/08/22 16:24:12-07:00 brian@zim.(none) 
        This changest:
        Plugins now when compiled or not compiled work correctly with status variables. 
        Status variables from plugins now set their own names (removed bit where plugin name was pre-appended this broke Innodb and Cluster)
        A few Makefile cleanups. 
      
      sql/ha_innodb.cc
        2006/08/22 16:24:08-07:00 brian@zim.(none) +16 -6
        Cleanup to make status variables directly in engine
      489ada03
    • marko's avatar
      ha_innodb.cc: Adjust the comment related to r784. Apparently it was · 2570bfa1
      marko authored
      changed after review on the MySQL side.
      2570bfa1
  8. 01 Sep, 2006 2 commits
    • marko's avatar
      Merge a patch from MySQL AB: · 0af6b4a2
      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.
      0af6b4a2
    • marko's avatar
      Revert the hunk on ha_innobase::innobase_read_and_init_auto_inc() · cc69e944
      marko authored
      that was accidentally committed in r782.
      cc69e944
  9. 31 Aug, 2006 6 commits
  10. 30 Aug, 2006 1 commit
    • marko's avatar
      Merge changes from MySQL AB: · 71cdd575
      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.
      71cdd575
  11. 29 Aug, 2006 3 commits
  12. 28 Aug, 2006 3 commits
    • marko's avatar
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser · e8435b3e
      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.)
      e8435b3e
    • osku's avatar
      page_validate(): Add missing space to error print, for real this time, · 9474455e
      osku authored
      following an error in r761.
      9474455e
    • osku's avatar
      btr_cur_search_to_nth_level(): Document where cursor is left at in · 903f12c6
      osku authored
      PAGE_CUR_LE searches.
      
      page_validate(): Add missing space to error print.
      903f12c6
  13. 22 Aug, 2006 1 commit
  14. 17 Aug, 2006 2 commits
  15. 16 Aug, 2006 1 commit
  16. 14 Aug, 2006 2 commits