1. 18 Jun, 2009 1 commit
    • Sergey Vojtovich's avatar
      Fixed build failures. · 0fa4924f
      Sergey Vojtovich authored
      storage/innodb_plugin/Makefile.am:
        Removed handler0vars.h from source distribution.
      win/Makefile.am:
        Fixed incorrect merge.
      0fa4924f
  2. 17 Jun, 2009 3 commits
    • Vladislav Vaintroub's avatar
      merge · 87da3df6
      Vladislav Vaintroub authored
      87da3df6
    • Vladislav Vaintroub's avatar
      Fixed type defintion for os_thread_id_t on 64 bit Windows. · 00182614
      Vladislav Vaintroub authored
      It used to be declared as ulint, which is 32/64 bit integer depending on OS bitness.
      However this declaration lead to problems with os_compare_and_swap_thread_id 
      implementation which operated on 32 bit integers (InterlockedCompareExchange)
      
      Using 64 bit int   lead to  wrong result in os_compare_and_swap_thread_id 
      and to crash/assertion in  rw_lock_set_writer_id_and_recursion_flag()
      
      The fix is to use 4 byte integer to os_thread_id type definition.
      00182614
    • Sergey Vojtovich's avatar
      When using bundled zlib, INNODB_PLUGIN was looking for · 8469eee8
      Sergey Vojtovich authored
      zlib headers in wrong location.
      
      Fixed by using path exported by zlib.m4 macro.
      
      storage/innodb_plugin/Makefile.am:
        Include zlib headers from a proper location.
      8469eee8
  3. 11 Jun, 2009 3 commits
    • Sergey Vojtovich's avatar
      Make innodb test suite pass with INNODB_PLUGIN. · 4e430bb4
      Sergey Vojtovich authored
      mysql-test/suite/innodb/my.cnf:
        Added temporary my.cnf for initial testing.
      mysql-test/suite/innodb/t/disabled.def:
        Disabled innodb-index test until we know how to fix it.
        An error message appears in the error log, which is likely
        needs to be suppressed.
      mysql-test/suite/innodb/t/innodb-analyze.test:
        Cleanup variables before returning.
      mysql-test/suite/innodb/t/innodb-index.test:
        Include file from proper location.
      mysql-test/suite/innodb/t/innodb-index_ucs2.test:
        Include file from proper location.
      mysql-test/suite/innodb/t/innodb_bug36169.test:
        Cleanup variables before returning.
      mysql-test/suite/innodb/t/innodb_bug36172.test:
        Cleanup variables before returning.
      4e430bb4
    • Satya B's avatar
      Remove the following tests and include files as they are already in · ad9bbfe5
      Satya B authored
      the mysql test suite.
      
      Tests removed:
      1. innodb_trx_weight.test
      2. innodb_bug35220.test
      
      Include files removed:
      1. have_innodb.inc
      2. ctype_innodb_like.inc
      3. innodb_trx_weight.inc
      
      Also add the missing opt file for the test innodb-use-sys-malloc.test
      ad9bbfe5
    • Satya B's avatar
      merge from mysql-5.1-innodb_plugin · ef82eaf2
      Satya B authored
      ef82eaf2
  4. 10 Jun, 2009 3 commits
    • Sergey Vojtovich's avatar
      Removed legacy name for innodb_plugin SE, so --with[out]-innodb · c182f701
      Sergey Vojtovich authored
      option doesn't affect innodb_plugin.
      
      Currently it works as following:
      * configure without relevant options producing two dynamic plugins
      * configure --with-plugin-innodb (or legacy --with-innodb) producing
        static standard InnoDB
      * configure --without-plugin-innodb (or legacy --without-innodb)
        disabling standard InnoDB
      * configure --with-plugin-innodb_plugin producing dynamic innodb_plugin
      * configure --without-plugin-innodb_plugin disabling innodb_plugin
      
      storage/innodb_plugin/plug.in:
        Removed legacy name for innodb_plugin SE.
      c182f701
    • Satya B's avatar
      Add innodb plugin tests to a new mysql test suite 'innodb'. · 098679e8
      Satya B authored
      Created a test suite 'innodb' under mysql-test/suite/innodb for the innodb plugin tests.
      test suite 'innodb' has tests only which are not under any other mysql-test suites.
      
      Total 14 testcases are added to the test suite.
      
      Note: the patches in storage/innodb_plugin/mysql-test/patches are not applied yet
      098679e8
    • Vladislav Vaintroub's avatar
      Backport WL#3653 to 5.1 to enable bundled innodb plugin. · 768bbae9
      Vladislav Vaintroub authored
      Remove custom DLL loader code from innodb plugin code, use 
      symbols exported from mysqld.
      
      
      storage/innodb_plugin/handler/ha_innodb.cc:
        Remove a Win32 workaround for current_thd.
        The original  problem that innodb plugin used
        value of TLS variable across DLL boundaries is 
        solved in MySQL server (current_thd is a function
        not TLS variable now)
      storage/innodb_plugin/handler/handler0alter.cc:
        Remove custom delay loader
      storage/innodb_plugin/handler/handler0vars.h:
        Remove custom delay loader
      storage/innodb_plugin/handler/i_s.cc:
        Remove custom delay loader
      storage/innodb_plugin/handler/win_delay_loader.cc:
        Remove custom delay loader
      storage/innodb_plugin/plug.in:
        Remove commented out MYSQL_PLUGIN_STATIC, 
        CMake would not parse that correctly
      768bbae9
  5. 09 Jun, 2009 1 commit
  6. 05 Jun, 2009 2 commits
  7. 03 Jun, 2009 1 commit
  8. 02 Jun, 2009 1 commit
  9. 29 May, 2009 3 commits
    • Satya B's avatar
      Compile the Innodb plugin so that it can be installed as dynamic plugin only for now. · 797cc5a7
      Satya B authored
      The Innodb plugin 1.0.4 can be installed dynamically using the 'INSTALL PLUGIN' syntax
      
      If mysqld is already statically linked with the inbuilt innodb, it is not possible to 
      install the innodb plugin 1.0.4 dynamically. Doing so would throw this error - Function
      'innodb' already exists.
      
      storage/innodb_plugin/Makefile.am:
        Remove references of 'storage/innobase' and use $(srcdir) instead. 
        Renamed the dynamic plugin library name to 'ha_innodb_plugin' so 
        that it can be installed along with inbuilt plugin.
      storage/innodb_plugin/Makefile.in:
        Remove this file as it can be generated automatically by automake
        using the Makefile.am
      storage/innodb_plugin/handler/ha_innodb.cc:
        Remove refernces to "storage/innobase" and the headers can be included directly.
        Declare the plugin with the new name innodb_plugin
      storage/innodb_plugin/plug.in:
        Rename the plugin innobase as innodb_plugin
      797cc5a7
    • Bjorn Munch's avatar
      fixed .bzr-mysql/default.conf · 709cd009
      Bjorn Munch authored
      709cd009
    • Bjorn Munch's avatar
      merge from 5.1 main · cf6aeea4
      Bjorn Munch authored
      cf6aeea4
  10. 28 May, 2009 3 commits
  11. 27 May, 2009 9 commits
  12. 26 May, 2009 2 commits
  13. 25 May, 2009 5 commits
    • Bjorn Munch's avatar
      merge from 5.1-mtr · d7d3c56a
      Bjorn Munch authored
      d7d3c56a
    • Staale Smedseng's avatar
      Bug #44736 mysqld_safe's my_which() is broken and · a1212080
      Staale Smedseng authored
      doesn't find 'logger'
      
      Due to a variable quoting mistake, the $PATH environment
      variable isn't parsed correctly when searching for the
      existence of the desired executable(s) (logger in this 
      case).
      
      This patch removes the quotes.
      a1212080
    • Bjorn Munch's avatar
      Bug #44922 mysqltest's query_get_value function can't work with queries containing ',' · b12bb225
      Bjorn Munch authored
      check_command_args() always looks for the first , (or whatever)
      Extended check_command_args() to let arguments be quoted
      Added test in mysqltest.test
      b12bb225
    • Davi Arnaut's avatar
      Bug#42158: leak: SSL_get_peer_certificate() doesn't have matching X509_free() · 7c4eb8c0
      Davi Arnaut authored
      The problem is that the server failed to follow the rule that
      every X509 object retrieved using SSL_get_peer_certificate()
      must be explicitly freed by X509_free(). This caused a memory
      leak for builds linked against OpenSSL where the X509 object
      is reference counted -- improper counting will prevent the
      object from being destroyed once the session containing the
      peer certificate is freed.
      
      The solution is to explicitly free every X509 object used.
      
      mysql-test/r/openssl_1.result:
        Add test case result for Bug#42158
      mysql-test/t/openssl_1.test:
        Add test case for Bug#42158
      sql/sql_acl.cc:
        Deallocate X509 objects.
      7c4eb8c0
    • Georgi Kodinov's avatar
      Bug #44399 : crash with statement using TEXT columns, aggregates, GROUP BY, and · 73481404
      Georgi Kodinov authored
      HAVING
                  
      When calculating GROUP BY the server caches some expressions. It does
      that by allocating a string slot (Item_copy_string) and assigning the 
      value of the expression to it. This effectively means that the result
      type of the expression can be changed from whatever it was to a string.
      As this substitution takes place after the compile-time result type 
      calculation for IN but before the run-time type calculations, 
      it causes the type calculations in the IN function done at run time 
      to get unexpected results different from what was prepared at compile time.
                        
      In the CASE ... WHEN ... THEN ... statement there was a similar problem
      and it was solved by artificially adding a STRING argument to the set of 
      types of the IN/CASE arguments at compile time, so if any of the 
      arguments of the CASE function changes its type to a string it will 
      still be covered by the information prepared at compile time.
      
      mysql-test/include/mix1.inc:
        Bug #44399: extended the test to cover the different types
      mysql-test/r/func_in.result:
        Bug #44399: test case
      mysql-test/r/innodb_mysql.result:
        Bug #44399: extended the test to cover the different types
      mysql-test/t/func_in.test:
        Bug #44399: test case
      sql/item.cc:
        Bug #44399: Implement typed caching for GROUP BY
      sql/item.h:
        Bug #44399: Implement typed caching for GROUP BY
      sql/item_cmpfunc.cc:
        Bug #44399: remove the special case
      sql/sql_select.cc:
        Bug #44399: Implement typed caching for GROUP BY
      73481404
  14. 23 May, 2009 1 commit
  15. 22 May, 2009 2 commits
    • Luis Soares's avatar
      BUG#41725: upmerge: 5.0-bt --> 5.1-bt · c8c688da
      Luis Soares authored
      c8c688da
    • Luis Soares's avatar
      BUG#41725: slave crashes when inserting into temporary table after · 8e589d1d
      Luis Soares authored
      stop/start slave
            
      When stopping and restarting the slave while it is replicating
      temporary tables, the server would crash or raise an assertion
      failure. This was due to the fact that although temporary tables are
      saved between slave threads restart, the reference to the thread in
      use (table->in_use) was not being properly updated when the restart
      happened (it would still reference the old/invalid thread instead of
      the new one).
            
      This patch addresses this issue by resetting the reference to the new
      slave thread on slave thread restart.
      
      mysql-test/r/rpl_temporary.result:
        Result file.
      mysql-test/t/rpl_temporary.test:
        Test case that checks that both failures go away.
      sql/slave.cc:
        Changed slave.cc to reset sql_thd reference in temporary tables.
      8e589d1d