1. 30 Oct, 2008 2 commits
    • vasil's avatar
      branches/zip: · 26bf890d
      vasil authored
      Followup to r2935: add the Windows Delay Loader stuff for the MySQL
      variable that we are accessing. If someday we have another solution for
      Bug#40360 Binlog related errors with binlog off
      then this should also be reverted.
      26bf890d
    • vasil's avatar
      branches/zip: · 8c5b85dd
      vasil authored
      Fix "Bug#40360 Binlog related errors with binlog off" in InnoDB code in order
      to have a Bug#40360-free InnoDB Plugin 1.0.2.
      
      The fix does check whether binary logging is enabled in MySQL by accessing the
      opt_bin_log global variable that is defined in sql/mysqld.cc.
      
      In case MySQL does develop another solution to this via Bug#40360 then we can
      revert this patch (except the mysql-tests).
      
      The windows-plugin part of this fix will be committed as a separate commit to
      ease eventual merge into branches/5.1 [note from the future: the separate
      commit went into r2936].
      
      Approved by:	Marko (https://svn.innodb.com/rb/r/39)
      8c5b85dd
  2. 29 Oct, 2008 7 commits
    • vasil's avatar
      branches/zip: · fe97ea6f
      vasil authored
      Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1.
      fe97ea6f
    • marko's avatar
      branches/zip: Merge revisions 2854:2929 from branches/5.1, · 9d2fe138
      marko authored
      except r2924, which was merged from branches/zip r2866 to branches/5.1
      and except r2879 which was merged separately by Calvin:
      
        ------------------------------------------------------------------------
        r2902 | vasil | 2008-10-28 12:10:25 +0200 (Tue, 28 Oct 2008) | 10 lines
      
        branches/5.1:
      
        Fix Bug#38189 innodb_stats_on_metadata missing
      
        Make the variable innodb_stats_on_metadata visible to the users and
        also settable at runtime. Previously it was only "visible" as a command
        line startup option to mysqld.
      
        Approved by:    Marko (https://svn.innodb.com/rb/r/36)
        ------------------------------------------------------------------------
        r2929 | marko | 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) | 13 lines
      
        branches/5.1: dtype_get_sql_null_size(): return the correct storage
        size of a SQL NULL column. (Bug #40369)
      
        When MySQL Bug #20877 was fixed in r834, this function was
        accidentally modified to return 0 or 1. Apparently, the only impact of
        this bug is that fixed-length columns cannot be updated in-place from
        or to SQL NULL, even in ROW_FORMAT=REDUNDANT.  After this fix,
        fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant
        storage size as they should, no matter if NULL or non-NULL.  The bug
        caused fixed-length NULL columns to occupy 1 byte.
      
        rb://37 approved by Heikki over IM.
        ------------------------------------------------------------------------
      9d2fe138
    • michael's avatar
      Remove unnecessary assert · 4c7b3cb7
      michael authored
      Approved by: Heikki, over IM
      4c7b3cb7
    • marko's avatar
      branches/zip: ha_innodb.cc: Make some functions static, so that they will · f3d875b2
      marko authored
      not be compiled as weak global symbols.  These functions must not be
      redirected to the built-in InnoDB.
      f3d875b2
    • calvin's avatar
      branches/zip: change function names in sql/mysqld.def in order · 0981c79d
      calvin authored
      to work with 5.1.29-rc.
      
      In 5.1.29, the following function names are changed:
        _hash_init
        hash_free
        hash_search
        hash_delete
      
      changed to
        _my_hash_init
        my_hash_free
        my_hash_search
        my_hash_delete
      
      Approved by:	Marko (on IM)
      0981c79d
    • marko's avatar
      branches/zip: ChangeLog: Mention Bug #27276. · 97ffec74
      marko authored
      97ffec74
    • calvin's avatar
      branches/zip: fix issue #102 - Windows plugin: resolve dbug functions · ca0f9648
      calvin authored
      during run-time.
      
      Implement wrapper functions in the plugin. The plugin will get the
      function entries from mysqld.exe during the init, and invoke the
      corresponding functions (in mysqld.exe). The list of functions are:
      
      	_db_pargs_
      	_db_doprnt_
      	_db_enter_
      	_db_return_
      	_db_dump_
      
      rb://38
      
      Approved by:	Marko
      ca0f9648
  3. 28 Oct, 2008 4 commits
  4. 27 Oct, 2008 5 commits
    • calvin's avatar
      branches/zip: for building dynamic plugin on Windows, ha_innodb.dll, · 26eb579b
      calvin authored
      when INNODB_DYNAMIC_PLUGIN is specified.
      
      The changes are:
      
      CMakeLists.txt: add project ha_innodb for dynamic plugin on Windows.
      ha_innodb depends on project mysqld.
      
      ha_innodb.def: a new file with standard exports for a dynamic plugin.
      
      Two new files will be added:
       * sql/mysqld.def:	.def file for 32-bit compiler
       * sql/mysqld_x64.def:	.def file for x64 compiler
      
      It is also required to apply a patch to the MySQL source tree. The 
      patch is described in win-plugin/README:
      
      win-plugin/win-plugin.diff - a patch to be applied to MySQL source
      tree. When applied, the following files will be modified:
       * CMakeLists.txt:	add INNODB_DYNAMIC_PLUGIN and _USE_32BIT_TIME_T
       * sql/CMakeLists.txt:	add mysqld.def or mysqld_x64.def for mysqld
       * win/configure.js:	add INNODB_DYNAMIC_PLUGIN
       * win/build-vs71.bat:	provide an option to specify CMAKE_BUILD_TYPE
       * win/build-vs8.bat:	provide an option to specify CMAKE_BUILD_TYPE
       * win/build-vs8_x64.bat: provide an option to specify CMAKE_BUILD_TYPE
      26eb579b
    • calvin's avatar
      branches/zip: implement the delayloading of externals for the plugin · 0120ce57
      calvin authored
      on Windows, which includes:
      
       * Load mysqld.map and insert all symbol/address pairs into hash for
         quick access
       * Resolves all external data variables. The delayloading mechanism
         in MSVC does not support automatic imports of data variables.
         A workaround is to explicitly handle the data import using the delay
         loader during the initialization of the plugin.
       * Resolves all external functions during run-time, by implementing
         the delayed loading helper function delayLoadHelper2, which is
         called by run-time as well as HrLoadAllImportsForDll. 
      
      The delay loader reuses the hash implementation in InnoDB. The normal
      hash_create (in hash0hash.c) creates hash tables in buffer pool. But
      the delay loader is invoked before the engine is initialized, and 
      buffer pools are not ready yet. Instead, the delay loader has its own
      implementation of hash_create() and hash_table_free(), called
      wdl_hash_create() and wdl_hash_table_free().
      
      This patch should be used with other two patches in order to build
      a dynamically linked plugin on Windows:
       * patch for tmpfile functions (r2886)
       * patch for "build" files (to be committed)
       
      The list of file changed:
      
      handler/handler0vars.h: new file, defines a list of external data
      variables (no external functions).
      
      handler/win_delay_loader.cc: new file, the implementation of the delay
      loader for Windows plugin.
      
      handler/ha_innodb.cc: add a header file, and changes for copying the
      system variables.
      
      handler/handler0alter.cc: add a header file
      
      handler/i_s.cc: add a header file
      
      rb://27
      
      Reviewed by:	Sunny, Marko
      Approved by:	Sunny
      0120ce57
    • calvin's avatar
      branches/zip: This patch is to solve the issue that file handles can · d0b8db14
      calvin authored
      not cross DLL/EXE boundaries on Windows. In builtin InnoDB, it makes
      call to MySQL server for creating tmp files. innobase_mysql_tmpfile
      is now rewritten for the plugin. 
      
      rb://5
      
      Approved by:	Marko
      d0b8db14
    • vasil's avatar
      branches/zip: · 218715bb
      vasil authored
      ChangeLog:
      
      Add entry for the fix of Bug#19424 InnoDB: Possibly a memory overrun of
      the buffer being freed (64-bit Visual C)
      218715bb
    • calvin's avatar
      branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory · 58e60bac
      calvin authored
      overrun of the buffer being freed with 64-bit Microsoft Visual C++.
      
      The changed file:
      
      CMakeLists.txt: Removing Win64 compiler optimizations for all 
      innodb/mem/* files.
      58e60bac
  5. 24 Oct, 2008 4 commits
  6. 23 Oct, 2008 7 commits
    • marko's avatar
      branches/zip: ibuf_delete_rec(): When the cursor to the insert buffer record · 851d7956
      marko authored
      cannot be restored, do not complain if the tablespace does not exist.
      This fixes Issue #88.
      851d7956
    • marko's avatar
      branches/zip: Non-functional changes: · cab02dbe
      marko authored
      ibuf_get_volume_buffered(): Declare with static linkage.
      This function is private to ibuf0ibuf.c.
      
      btr_cur_pessimistic_delete(): Use the cached result of
      btr_cur_get_index(cursor).
      cab02dbe
    • marko's avatar
      branches/zip: Clean up the file format stamping. · 6b36cc4b
      marko authored
      trx_sys_file_format_max_upgrade(): Rename from
      trx_sys_file_format_max_update().  Improve the documentation.  Add a
      const qualifier to the parameter "name".  Replace the parameter
      "flags" with "format_id", because this function should deal with file
      format identifiers, not with table flags.
      
      trx_sys_file_format_max_write(), trx_sys_file_format_max_set(): Add a
      const qualifier to the parameter "name".
      
      ha_innodb.cc: Correct the spelling in some comments: "side effect".
      Remove redundant prototypes for some static callback functions.
      
      innodb_file_format_name_update(), innodb_file_format_check_update():
      Correct the function signature.  Use appropriate pointer type conversions.
      
      MYSQL_SYSVAR_STR(file_format), MYSQL_SYSVAR_STR(file_format_check):
      Remove the type conversions from the callback function pointers.  When
      the function signatures match, no type conversion is needed.  The type
      conversions would only prevent compilation warnings for any mismatch.
      
      Approved by Sunny in rb://25.
      6b36cc4b
    • vasil's avatar
      branches/zip: · 19893425
      vasil authored
      Update the ChangeLog
      19893425
    • sunny's avatar
      branches/zip: · f3c6e06e
      sunny authored
      Merge revisions 2852:2854 from branches/5.1:
      
        ------------------------------------------------------------------------
        r2854 | sunny | 2008-10-23 08:30:32 +0300 (Thu, 23 Oct 2008) | 13 lines
        Changed paths:
           M /branches/5.1/dict/dict0dict.c
           M /branches/5.1/dict/dict0mem.c
           M /branches/5.1/handler/ha_innodb.cc
           M /branches/5.1/handler/ha_innodb.h
           M /branches/5.1/include/dict0dict.h
           M /branches/5.1/include/dict0mem.h
           M /branches/5.1/row/row0mysql.c
        
        branches/5.1: Backport changes from branches/zip r2725
        
        Simplify the autoinc initialization code. This removes the
        non-determinism related to reading the table's autoinc value for the first
        time. This change has also reduced the sizeof dict_table_t by sizeof(ibool)
        bytes because we don't need the dict_table_t::autoinc_inited field anymore.
        
        Bug#39830 Table autoinc value not updated on first insert.
        Bug#35498 Cannot get table test/table1 auto-inccounter value in ::info
        Bug#36411 Failed to read auto-increment value from storage engine" in 5.1.24 auto-inc
        rb://16
        
        
        ------------------------------------------------------------------------
      f3c6e06e
    • sunny's avatar
      Reverting test file changes from r2855 · d7655cbc
      sunny authored
      d7655cbc
    • sunny's avatar
      branches/zip: · a348cac4
      sunny authored
      Merge revisions 2837:2852 from branches/5.1:
      
        ------------------------------------------------------------------------
        r2849 | sunny | 2008-10-22 12:01:18 +0300 (Wed, 22 Oct 2008) | 8 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
           M /branches/5.1/include/row0mysql.h
           M /branches/5.1/row/row0mysql.c
        
        branches/5.1: Return the actual error code encountered when allocating
        a new autoinc value. The change in behavior (bug) was introduced in 5.1.22
        when we introduced the new AUTOINC locking model.
        
        rb://31
        
        Bug#40224 New AUTOINC changes mask reporting of deadlock/timeout errors
        
        ------------------------------------------------------------------------
        r2852 | sunny | 2008-10-23 01:42:24 +0300 (Thu, 23 Oct 2008) | 9 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
           M /branches/5.1/handler/ha_innodb.h
        
        branches/5.1: Backport r2724 from branches/zip
        
        Check column value against the col max value before updating the table's
        global autoinc counter value. This is part of simplifying the AUTOINC
        sub-system. We extract the type info from MySQL data structures at runtime.
        
        This fixes Bug#37788 InnoDB Plugin: AUTO_INCREMENT wrong for compressed tables
        
        
        ------------------------------------------------------------------------
      a348cac4
  7. 22 Oct, 2008 3 commits
  8. 21 Oct, 2008 4 commits
    • vasil's avatar
      branches/zip: · 3df06e71
      vasil authored
      Merge 2744:2837 from branches/5.1 (skipping r2782 and r2826):
      
        ------------------------------------------------------------------------
        r2832 | vasil | 2008-10-21 10:08:30 +0300 (Tue, 21 Oct 2008) | 10 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
        
        branches/5.1:
        
        In ha_innobase::info():
        
        Replace sql_print_warning() which prints to mysqld error log with
        push_warning_printf() which sends the error message to the client.
        
        Suggested by:	Marko, Sunny, Michael
        Objected by:	Inaam
        
        ------------------------------------------------------------------------
        r2837 | vasil | 2008-10-21 12:07:44 +0300 (Tue, 21 Oct 2008) | 32 lines
        Changed paths:
           M /branches/5.1/mysql-test/innodb-semi-consistent.result
           M /branches/5.1/mysql-test/innodb-semi-consistent.test
           M /branches/5.1/mysql-test/innodb.result
           M /branches/5.1/mysql-test/innodb.test
        
        branches/5.1:
        
        Merge a change from MySQL (this fixes the failing innodb and
        innodb-semi-consistent tests):
        
          revno: 2757
          committer: Georgi Kodinov <kgeorge@mysql.com>
          branch nick: B39812-5.1-5.1.29-rc
          timestamp: Fri 2008-10-03 15:24:19 +0300
          message:
            Bug #39812: Make statement replication default for 5.1 (to match 5.0)
            
            Make STMT replication default for 5.1.
            Add a default of MIXED into the config files
            Fix the tests that needed MIXED replication mode.
          modified:
            mysql-test/include/mix1.inc
            mysql-test/r/innodb-semi-consistent.result
            mysql-test/r/innodb.result
            mysql-test/r/innodb_mysql.result
            mysql-test/r/tx_isolation_func.result
            mysql-test/t/innodb-semi-consistent.test
            mysql-test/t/innodb.test
            mysql-test/t/tx_isolation_func.test
            sql/mysqld.cc
            support-files/my-huge.cnf.sh
            support-files/my-innodb-heavy-4G.cnf.sh
            support-files/my-large.cnf.sh
            support-files/my-medium.cnf.sh
            support-files/my-small.cnf.sh
        
        
        ------------------------------------------------------------------------
      3df06e71
    • marko's avatar
      afef90be
    • marko's avatar
    • marko's avatar
      branches/zip: ibuf_insert_low(): Avoid unnecessarily · 172ceab0
      marko authored
      acquiring and releasing ibuf_mutex.
      172ceab0
  9. 20 Oct, 2008 2 commits
  10. 16 Oct, 2008 2 commits
    • vasil's avatar
      branches/zip: · 965fb570
      vasil authored
      Fix Mantis issue#61:
      
      In row_undo_ins_parse_undo_rec(): if we find that a table has no indexes
      (dict_table_get_first_index() returns NULL) do not try to call
      trx_undo_rec_get_row_ref() with a NULL pointer because that would lead to
      a crash. Instead, print a warning and set node->table to NULL just like
      it is done if the .ibd file is missing.
      
      Approved by:	Heikki (via IM)
      965fb570
    • marko's avatar
      branches/zip: Skip the undo log size check on REDUNDANT and COMPACT tables. · b5146843
      marko authored
      In ROW_FORMAT=DYNAMIC and ROW_FORMAT=COMPRESSED, column prefix indexes
      require that prefixes of externally stored columns be written to the
      undo log. This may make the undo log record bigger than the record on
      the B-tree page.  The maximum size of an undo log record is the page
      size.  That must be checked for, in dict_index_add_to_cache().
      
      dict_index_add_to_cache(): Skip the undo log size check for REDUNDANT
      and COMPACT tables. These tables store prefixes of externally stored
      columns locally within the clustered index record.  There are no special
      considerations for the undo log record size.
      
      innodb-index.test: Ensure that the check exists for ROW_FORMAT=DYNAMIC,
      but not for ROW_FORMAT=COMPACT.
      
      This fixes issue #99.  rb://28 approved by Sunny.
      b5146843