1. 10 Jun, 2009 1 commit
    • 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
  2. 05 Jun, 2009 2 commits
  3. 03 Jun, 2009 1 commit
  4. 02 Jun, 2009 1 commit
  5. 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
  6. 28 May, 2009 3 commits
  7. 27 May, 2009 9 commits
  8. 26 May, 2009 2 commits
  9. 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
  10. 23 May, 2009 1 commit
  11. 22 May, 2009 6 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
    • Patrick Crews's avatar
      merge · a41d2daf
      Patrick Crews authored
      a41d2daf
    • Patrick Crews's avatar
      merge 5.0-> 5.1 · 2c5e79bb
      Patrick Crews authored
      2c5e79bb
    • Patrick Crews's avatar
      Bug#40465 - mysqldump.test does no checking of dump or restore · e42f2819
      Patrick Crews authored
      Created new .test file - mysqldump_restore that does test restore from mysqldump
      output for a limited number of basic cases.
      Create new .inc file - mysqldump.inc - renames original table and uses mysqldump
      output to recreate the table, then uses diff_tables.inc to compare the two tables.
      Backported include/diff_tables.inc to facilitate this testing.
      New patch incorporating review feedback prior to push.
      
      mysqldump.test - removed redundant call to include/have_log_bin.inc (was used twice in the test!)
      e42f2819
    • Gleb Shchepa's avatar
      Bug #42778: delete order by null global variable causes · 8354ce07
      Gleb Shchepa authored
                  assertion .\filesort.cc, line 797
      
      Minor fix to test case (embedded server failure).
      8354ce07
  12. 21 May, 2009 6 commits
    • Gleb Shchepa's avatar
      Bug #42778: delete order by null global variable causes · 06142cd5
      Gleb Shchepa authored
                  assertion .\filesort.cc, line 797
      
      A query with the "ORDER BY @@some_system_variable" clause,
      where @@some_system_variable is NULL, causes assertion
      failure in the filesort procedures.
      
      The reason of the failure is in the value of
      Item_func_get_system_var::maybe_null: it was unconditionally
      set to false even if the value of a variable was NULL.
      
      
      mysql-test/r/variables.result:
        Added test case for bug #42778.
      mysql-test/suite/sys_vars/r/innodb_data_home_dir_basic.result:
        Updated test case for bug #42778:
        system variables were NOT NULL, now they are nullable.
      mysql-test/suite/sys_vars/r/innodb_flush_method_basic.result:
        Updated test case for bug #42778:
        system variables were NOT NULL, now they are nullable.
      mysql-test/suite/sys_vars/r/rpl_init_slave_func.result:
        Updated test case for bug #42778:
        system variables were NOT NULL, now they are nullable.
      mysql-test/suite/sys_vars/r/ssl_capath_basic.result:
        Updated test case for bug #42778:
        system variables were NOT NULL, now they are nullable.
      mysql-test/suite/sys_vars/r/ssl_cipher_basic.result:
        Updated test case for bug #42778:
        system variables were NOT NULL, now they are nullable.
      mysql-test/suite/sys_vars/t/innodb_data_home_dir_basic.test:
        Updated test case for bug #42778:
        system variables were NOT NULL, now they are nullable.
      mysql-test/suite/sys_vars/t/innodb_flush_method_basic.test:
        Updated test case for bug #42778:
        system variables were NOT NULL, now they are nullable.
      mysql-test/suite/sys_vars/t/ssl_capath_basic.test:
        Updated test case for bug #42778:
        system variables were NOT NULL, now they are nullable.
      mysql-test/suite/sys_vars/t/ssl_cipher_basic.test:
        Updated test case for bug #42778:
        system variables were NOT NULL, now they are nullable.
      mysql-test/t/variables.test:
        Added test case for bug #42778.
      sql/item.cc:
        Bug #42778: delete order by null global variable causes
                    assertion .\filesort.cc, line 797
        
        The longlong_from_string_with_check function has been modified
        to skip unwanted warnings: now it uses the THD::no_errors
        flag to suppress warnings.
        The Item_func_get_system_var::update_null_value method
        sets the no_error flag.
      sql/item_func.cc:
        Bug #42778: delete order by null global variable causes
                    assertion .\filesort.cc, line 797
        
        1. The Item_func_get_system_var::fix_length_and_dec method
           has been modified to make system variables truly nullable.
        
        2. The Item_func_get_system_var::update_null_value method
           method has been overloaded with a simple wrapper (like
           Item_field::update_null_value) to suppress unwanted warnings
           from Item_func_get_system_var::val_int() calls on non-numeric
           variable values: the Item_func_get_system_var::update_null_value
           method sets and restores THD::no_errors flag for a nested
           call of the longlong_from_string_with_check function.
      sql/item_func.h:
        Bug #42778: delete order by null global variable causes
                    assertion .\filesort.cc, line 797
        
        The Item_func_get_system_var::update_null_value method
        method has been overloaded.
      06142cd5
    • Patrick Crews's avatar
      Bug#40465: mysqldump.test does no checking of dump or restore. · 2a47699c
      Patrick Crews authored
      Created new .test file - mysqldump_restore that does this for a limited number
      of basic cases.
      Created new .inc file - mysqldump.inc - renames original table and uses mysqldump
      output to recreate the table, then uses diff_tables.inc to compare the two tables.
      Backported include/diff_tables.inc to facilitate this testing.
      2a47699c
    • Alexey Kopytov's avatar
      Automerge. · 42b3d8c7
      Alexey Kopytov authored
      42b3d8c7
    • Alexey Kopytov's avatar
      Automerge. · 645817dd
      Alexey Kopytov authored
      645817dd
    • Alexey Kopytov's avatar
      Attempt #2 to fix PB failures introduced by the patch for bug #44796. · 82c878f9
      Alexey Kopytov authored
      Since max_allowed_packet is a read-only variable in 5.1 and up,
      disable warnings to avoid unnecessary test case complication.
      82c878f9
    • Alexey Kopytov's avatar
      Automerge. · 2e644e2b
      Alexey Kopytov authored
      2e644e2b