1. 31 Oct, 2008 8 commits
    • marko's avatar
      branches/zip: scripts/install_innodb_plugins_win.sql: New script, · 5b4736c6
      marko authored
      for installing the InnoDB plugins in Windows.  Copied from
      scripts/install_innodb_plugins.sql.
      5b4736c6
    • vasil's avatar
      branches/zip: · b95ccf91
      vasil authored
      White-space cleanup in ChangeLog.
      b95ccf91
    • vasil's avatar
      branches/zip: · 375e9750
      vasil authored
      Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static
      InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl
      
      Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag.
      
      Approved by:	Marko (https://svn.innodb.com/rb/r/42/)
      375e9750
    • calvin's avatar
      branches/zip: Windows plugin part of r2944 · a019e95a
      calvin authored
      r2944 has reference to mysql_bin_log.is_open(), which is new in InnoDB.
      Add two new entries and remove one duplicate in mysqld.def & 
      mysqld_x64.def.
      a019e95a
    • marko's avatar
    • sunny's avatar
      branches/zip: Update ChangeLog with r2943 info. · b5c757cb
      sunny authored
      b5c757cb
    • vasil's avatar
      branches/zip: · 729ff1ad
      vasil authored
      Revert our temporary fix for "Bug#40360 Binlog related errors with binlog off"
      (r2935, r2936) and deploy MySQL's one, but put the function
      mysql_bin_log_is_engaged() inside mysql_addons.cc instead of in mysql's log.cc
      and use a different name for it so there is no collision when MySQL adds this
      function in log.cc.
      
      [note from the future: the windows part of this patch went into r2947]
      
      Approved by:	Marko (https://svn.innodb.com/rb/r/41/)
      729ff1ad
    • sunny's avatar
      branches/zip: · 7fed1c70
      sunny authored
        1. We add a vector of locks to trx_t. This array contains the autoinc
        locks granted to a transaction. There is one per table.
      
        2. We enforce releasing of these locks in the reverse order from the
        one in which they are acquired. The assumption is that since the
        AUTOINC locks are statement level locks. Nested statements introduced
        by triggers are stacked it should hold.
      
      There was some cleanup done to the vector code too by adding const and
      some new functions. Rename dict_table_t::auto_inc_lock to autoinc_lock.
      
      Fix Bug#26316 Triggers create duplicate entries on auto-increment columns
      rb://22
      7fed1c70
  2. 30 Oct, 2008 7 commits
    • vasil's avatar
      branches/zip: · eb1b8095
      vasil authored
      Increment the InnoDB Plugin version from 1.0.1 to 1.0.2.
      eb1b8095
    • marko's avatar
      acf0e85e
    • marko's avatar
    • vasil's avatar
      branches/zip: · 39b7e02a
      vasil authored
      Non-functional change: convert handler/handler0vars.h and
      handler/win_delay_loader.cc from \r\n (dos) to \n (unix) line terminators.
      39b7e02a
    • vasil's avatar
      branches/zip: · 05cb12e6
      vasil authored
      Add ChangeLog entry for Bug#40360 Binlog related errors with binlog off
      05cb12e6
    • vasil's avatar
      branches/zip: · 69977f27
      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.
      69977f27
    • vasil's avatar
      branches/zip: · c368f38f
      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)
      c368f38f
  3. 29 Oct, 2008 7 commits
    • vasil's avatar
      branches/zip: · 0f2b6ec6
      vasil authored
      Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1.
      0f2b6ec6
    • marko's avatar
      branches/zip: Merge revisions 2854:2929 from branches/5.1, · bd3514db
      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.
        ------------------------------------------------------------------------
      bd3514db
    • michael's avatar
      Remove unnecessary assert · a81e8ca8
      michael authored
      Approved by: Heikki, over IM
      a81e8ca8
    • marko's avatar
      branches/zip: ha_innodb.cc: Make some functions static, so that they will · e2656dba
      marko authored
      not be compiled as weak global symbols.  These functions must not be
      redirected to the built-in InnoDB.
      e2656dba
    • calvin's avatar
      branches/zip: change function names in sql/mysqld.def in order · 06bdbaa2
      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)
      06bdbaa2
    • marko's avatar
      branches/zip: ChangeLog: Mention Bug #27276. · 1e66bf40
      marko authored
      1e66bf40
    • calvin's avatar
      branches/zip: fix issue #102 - Windows plugin: resolve dbug functions · b7d0a777
      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
      b7d0a777
  4. 28 Oct, 2008 4 commits
  5. 27 Oct, 2008 5 commits
    • calvin's avatar
      branches/zip: for building dynamic plugin on Windows, ha_innodb.dll, · 117ae892
      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
      117ae892
    • calvin's avatar
      branches/zip: implement the delayloading of externals for the plugin · fd683162
      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
      fd683162
    • calvin's avatar
      branches/zip: This patch is to solve the issue that file handles can · ed35fc58
      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
      ed35fc58
    • vasil's avatar
      branches/zip: · 9b36639b
      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)
      9b36639b
    • calvin's avatar
      branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory · e3132ee4
      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.
      e3132ee4
  6. 24 Oct, 2008 4 commits
  7. 23 Oct, 2008 5 commits
    • marko's avatar
      branches/zip: ibuf_delete_rec(): When the cursor to the insert buffer record · fbf8532b
      marko authored
      cannot be restored, do not complain if the tablespace does not exist.
      This fixes Issue #88.
      fbf8532b
    • marko's avatar
      branches/zip: Non-functional changes: · 70f1f9e4
      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).
      70f1f9e4
    • marko's avatar
      branches/zip: Clean up the file format stamping. · d8fd1aec
      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.
      d8fd1aec
    • vasil's avatar
      branches/zip: · ef8226fc
      vasil authored
      Update the ChangeLog
      ef8226fc
    • sunny's avatar
      branches/zip: · 119142d2
      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
        
        
        ------------------------------------------------------------------------
      119142d2