An error occurred fetching the project authors.
  1. 11 Jan, 2007 3 commits
    • osku's avatar
      Change this in ha_innobase: · 58809043
      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.
      58809043
    • osku's avatar
      Apply patch from MySQL: · 76ad45ea
      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)
      76ad45ea
    • marko's avatar
      Merge a change from MySQL AB: · b0b266a9
      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
      b0b266a9
  2. 15 Dec, 2006 1 commit
  3. 12 Dec, 2006 1 commit
  4. 07 Dec, 2006 1 commit
  5. 01 Dec, 2006 1 commit
  6. 21 Nov, 2006 1 commit
  7. 16 Nov, 2006 1 commit
    • marko's avatar
      Merge a change from MySQL AB. · 7868898e
      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
      7868898e
  8. 10 Nov, 2006 1 commit
    • marko's avatar
      Minor cleanup. · 9954212f
      marko authored
      ha_innobase::rnd_pos(): Use correct format in DBUG_PRINT statements.
      
      buf_page_release(): Remove the local variable buf_fix_count.
      9954212f
  9. 03 Nov, 2006 1 commit
  10. 16 Oct, 2006 1 commit
  11. 09 Oct, 2006 1 commit
    • marko's avatar
      Merge changes from MySQL AB, and remove two compilation warnings. · e8bcfd5e
      marko authored
      ha_innodb.cc: innodb_mutex_show_status(): Add (ulong) casts to
      ulonglong expressions being passed to fprintf %lu.  The warnings
      were apparently introduced by MySQL AB developers.
      
      mysql_declare_plugin(innobase): Add PLUGIN_LICENSE_GPL.
      
      have_innodb.inc: Merge changes from MySQL AB.
      e8bcfd5e
  12. 03 Oct, 2006 1 commit
    • marko's avatar
      storage/innobase/handler: Merge changes from MySQL AB: · e1d04a69
      marko authored
      ChangeSet
        2006/09/30 18:44:42-07:00 brian@zim.(none) 
        Merge zim.(none):/home/brian/mysql/merge-5.1
        into  zim.(none):/home/brian/mysql/arch-5.1
      
      ChangeSet
        2006/09/30 12:49:46-07:00 brian@zim.(none) 
        This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).
        Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call. 
      
      ChangeSet
        2006/09/29 17:19:02-07:00 brian@zim.(none) 
        This removes the passing of global hton to engine instance. 
      
      ChangeSet
        2006/09/28 13:22:56+02:00 gbichot@dl145h.mysql.com 
        Merge gbichot@bk-internal:/home/bk/mysql-5.1-arch
        into  dl145h.mysql.com:/users/gbichot/mysql-5.1-arch
      
      ChangeSet
        2006/09/28 13:19:43+02:00 gbichot@dl145h.mysql.com 
        In the handlerton, cursor creation function don't have an argument
        and so the engine calls current_thd to derive transaction information;
        instead we now pass THD to those functions, it looks more logical
        (it makes the implicit current_thd parameter more visible).
        Approved by Brian and Monty.
      
      ChangeSet
        2006/09/26 22:51:53-07:00 brian@zim.(none) 
        Merge zim.(none):/home/brian/mysql/merge-5.1
        into  zim.(none):/home/brian/mysql/arch-5.1
      e1d04a69
  13. 20 Sep, 2006 2 commits
  14. 18 Sep, 2006 2 commits
    • marko's avatar
      dict_col_t: Copy the fields of "dtype_t type" directly to this structure, · 79644bdb
      marko authored
      so that all integer fields can be packed into 64 bits.  (Bug #20877)
      
      dtype_t: Change the type of all bit-fields to unsigned.
      
      dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
      dict_table_get_sys_col(), dict_field_get_col(): Return const
      dict_col_t*, so that changes to dict_col_t can be detected more
      easily.  Add const to many dict_col_t* declarations.
      
      dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
      
      dict_col_get_type(): Replace with dict_col_copy_type().
      
      dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
      dict_col_get_sql_null_size(): New functions.
      
      dtype_get_at_most_n_mbchars(): Replace the parameter dtype
      with the parameters prtype, mbminlen, mbmaxlen.
      
      dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
      cmp_whole_field(): Replace the dtype_t* parameter with the ulint
      parameters mtype, prtype.
      
      dtype_copy(): Add a const qualifier to type2 (the one being copied from).
      
      dtype_set_mblen(): Replaced with dtype_get_mblen().
      
      dtype_get_fixed_size_low(), dtype_get_min_size_low(),
      dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
      dtype_get_min_size(), and dtype_get_max_size().  These are used by the
      dict_col_get_{fixed,min,max}_size() functions.
      
      cmp_types_are_equal(): Replace with cmp_cols_are_equal().
      
      dict_table_get_col_name(): Add a const qualifier parameter to the
      parameter "table".
      
      dtype_binary, dtype_binary_val: Remove.
      
      dtype_is_fixed_size(): Remove.
      79644bdb
    • marko's avatar
  15. 14 Sep, 2006 2 commits
    • marko's avatar
      Turn ha_innobase::build_template() from a non-static member function · 486a36dd
      marko authored
      to a static plain function.
      486a36dd
    • marko's avatar
      Remove dict_col_t::clust_pos. · 3b49ab38
      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.
      3b49ab38
  16. 13 Sep, 2006 1 commit
  17. 12 Sep, 2006 1 commit
    • marko's avatar
      Reduce the size of the data dictionary cache. (Bug #20877) · 1c1026ec
      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.
      1c1026ec
  18. 11 Sep, 2006 1 commit
    • marko's avatar
      Merge code cleanup from MySQL AB: · 85f5b73e
      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)
      85f5b73e
  19. 05 Sep, 2006 1 commit
    • marko's avatar
      Merge change from MySQL AB: · 96ea6179
      marko authored
      ChangeSet
        2006/08/23 15:12:42-07:00 brian@zim.(none) 
        This is a cleanup of warnings that windows is complaining about. 
      
      sql/ha_innodb.cc
        2006/08/23 15:12:39-07:00 brian@zim.(none) +0 -1
        Removed unused variables
      96ea6179
  20. 04 Sep, 2006 2 commits
    • marko's avatar
      Merge code from MySQL AB: · 4af9b6d3
      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
      4af9b6d3
    • marko's avatar
      ha_innodb.cc: Adjust the comment related to r784. Apparently it was · 4941acd4
      marko authored
      changed after review on the MySQL side.
      4941acd4
  21. 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
  22. 31 Aug, 2006 1 commit
  23. 22 Aug, 2006 1 commit
  24. 11 Aug, 2006 2 commits
    • 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 (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
  25. 08 Aug, 2006 2 commits
  26. 07 Aug, 2006 3 commits
  27. 28 Jul, 2006 1 commit
  28. 13 Jun, 2006 1 commit
    • marko's avatar
      Merge changes from MySQL AB: · 3412bdf0
      marko authored
      innodb_mysql.test, innodb_mysql.result:
        Bug #16798: Uninitialized row buffer reads in ref-or-null optimizer
        Bug #12882: min/max inconsistent on empty table
        Test of behaviour with CREATE ... SELECT
       Moved from group_min_max.test:
        Bug #12672: primary key implicitly included in every innodb index
        Bug #6142: a problem with empty innodb table 
        Bug #9798: group by with rollup
      
      ChangeSet@2006/06/01 21:47:15+03:00 bell@sanja.is.com.ua 
      #   interface for transaction log management added to handlerton
      #   iterators creation interface added to handlerton
      ha_innodb.cc: Add get_log_status = create_iterator = NULL
      
      ChangeSet@2006/06/04 18:52:22+03:00 monty@mysql.com 
      #   This changeset is largely a handler cleanup changeset (WL#3281),
      #   but includes fixes and cleanups that was found necessary while
      #   testing the handler changes
      # sql/ha_innodb.h
      #   2006/06/04 18:52:09+03:00 monty@mysql.com +6 -13
      #   Update to 'newer' table handler interface
      #   - table_flags are now ulonglong
      #   - Added reset() method
      #   - Removed not needed ha_retrieve_all_cols() and ha_retrieve_all_pk()
      #     columns.
      #   - Made build_template() a class function to be able to easier access
      #     class variables
      # sql/ha_innodb.cc
      #   2006/06/04 18:52:09+03:00 monty@mysql.com +37 -44
      #   Update to 'newer' table handler interface
      #   - Update innobase_create_handler() to new interface
      #   - Removed HA_NOT_EXACT_COUNT (not needed)
      #   - Renamed HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
      #     to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
      #   - Prefixed base status variables with 'stats'
      #   - Use table column bitmaps instead of ha_get_bit_in_read_set()
      #   - Added ::reset(), with code from ::extra(HA_EXTRA_RESET)
      #   - Removed HA_EXTRA_RETRIVE_ALL_COLS and HA_EXTRA_RETRIEVE_PRIMARY_KEY as
      #     the table->read_set and table->write_set bitmaps now are accurate
      
      ChangeSet@2006/06/02 22:21:32+02:00 guilhem@mysql.com 
      #   First push for WL#3146 "less locking in auto_increment". It is a
      #   0-real-change patch.
      #   New prototype for get_auto_increment() (but new arguments not yet used),
      #   to be able to reserve a finite interval of auto_increment values from
      #   cooperating engines.
      #   A hint on how many values to reserve is found in
      #   handler::estimation_rows_to_insert,
      #   filled by ha_start_bulk_insert(), new wrapper around start_bulk_insert().
      #   NOTE: this patch changes nothing, for all engines.
      #   But it makes the API ready for those
      #   engines which will want to do reservation.
      #   More csets will come to complete WL#3146.
      ha_innodb.h, ha_innodb.cc: update to new prototype of get_auto_increment
      
      ChangeSet@2006/05/28 14:51:01+02:00 serg@sergbook.mysql.com 
      #   handlerton cleanup:
      #   duplicate fields removed, st_mysql_storage_engine added to support
      #   run-time handlerton initialization (no compiler warnings), handler API
      #   is now tied to MySQL version, handlerton->plugin mapping added
      #   (slot-based), dummy default_hton removed, plugin-type-specific
      #   initialization generalized, built-in plugins are now initialized too,
      #   --default-storage-engine no longer needs a list of storage engines
      #   in handle_options().
      #   
      # sql/ha_innodb.h
      #   2006/05/28 14:50:53+02:00 serg@sergbook.mysql.com +1 -1
      #   handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
      #   initialize handlerton run-time to avoid compiler warnings
      # 
      # sql/ha_innodb.cc
      #   2006/05/28 14:50:53+02:00 serg@sergbook.mysql.com +37 -52
      #   handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
      #   initialize handlerton run-time to avoid compiler warnings
      
      ChangeSet@2006/06/01 23:59:34+02:00 serg@serg.mylan 
      #   second patch for make distcheck
      ha_innodb.cc: enclose in #ifdef WITH_INNOBASE_STORAGE_ENGINE / #endif
      3412bdf0
  29. 02 Jun, 2006 1 commit
    • osku's avatar
      From MySQL: · bb37525b
      osku authored
      Fix bug #17264. For alter table on win32 for succesful operation completion
      it is used TL_WRITE(=10) lock instead of TL_WRITE_ALLOW_READ(=6), however in
      InnoDB handler TL_WRITE is lifted to TL_WRITE_ALLOW_WRITE, which causes race
      condition when several clients do alter table simultaneously.
      bb37525b