1. 11 Aug, 2011 1 commit
  2. 08 Aug, 2011 3 commits
  3. 02 Aug, 2011 1 commit
    • Sergey Glukhov's avatar
      Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUNCTION IN WHERE C · 09c2a14a
      Sergey Glukhov authored
      There is an optimization of DISTINCT in JOIN::optimize()
      which depends on THD::used_tables value. Each SELECT statement
      inside SP resets used_tables value(see mysql_select()) and it
      leads to wrong result. The fix is to replace THD::used_tables
      with LEX::used_tables.
      
      
      mysql-test/r/sp.result:
        test case
      mysql-test/t/sp.test:
        test case
      sql/sql_base.cc:
        THD::used_tables is replaced with LEX::used_tables
      sql/sql_class.cc:
        THD::used_tables is replaced with LEX::used_tables
      sql/sql_class.h:
        THD::used_tables is replaced with LEX::used_tables
      sql/sql_insert.cc:
        THD::used_tables is replaced with LEX::used_tables
      sql/sql_lex.cc:
        THD::used_tables is replaced with LEX::used_tables
      sql/sql_lex.h:
        THD::used_tables is replaced with LEX::used_tables
      sql/sql_prepare.cc:
        THD::used_tables is replaced with LEX::used_tables
      sql/sql_select.cc:
        THD::used_tables is replaced with LEX::used_tables
      09c2a14a
  4. 27 Jul, 2011 2 commits
  5. 22 Jul, 2011 2 commits
    • Alexander Nozdrin's avatar
      Manual merge from mysql-5.0. · 9bb51735
      Alexander Nozdrin authored
      9bb51735
    • Alexander Nozdrin's avatar
      For for Bug#12696072: FIX OUTDATED COPYRIGHT NOTICES IN RUNTIME RELATED CLIENT · 9c1aebb3
      Alexander Nozdrin authored
      TOOLS
      
      Backport a fix for Bug 57094 from 5.5.
      The following revision was backported:
      
      # revision-id: alexander.nozdrin@oracle.com-20101006150613-ls60rb2tq5dpyb5c
      # parent: bar@mysql.com-20101006121559-am1e05ykeicwnx48
      # committer: Alexander Nozdrin <alexander.nozdrin@oracle.com>
      # branch nick: mysql-5.5-bugteam-bug57094
      # timestamp: Wed 2010-10-06 19:06:13 +0400
      # message:
      #   Fix for Bug 57094 (Copyright notice incorrect?).
      #   
      #   The fix is to:
      #     - introduce ORACLE_WELCOME_COPYRIGHT_NOTICE define to have a single place
      #       to specify copyright notice;
      #     - replace custom copyright notices with ORACLE_WELCOME_COPYRIGHT_NOTICE
      #       in programs.
      9c1aebb3
  6. 19 Jul, 2011 1 commit
  7. 18 Jul, 2011 1 commit
  8. 15 Jul, 2011 3 commits
    • Bjorn Munch's avatar
      merge from 5.1 main · da4fc5cb
      Bjorn Munch authored
      da4fc5cb
    • Alexander Nozdrin's avatar
      Backport a fix for Bug#59060 (Valgrind warning in Protocol_text::store()). · da51493a
      Alexander Nozdrin authored
      Original changeset:
      revision-id: alexander.nozdrin@oracle.com-20101221122349-6h8ammcro70a4pac
      parent: sven.sandberg@oracle.com-20101221121948-hnivuulyohzch1v4
      committer: Alexander Nozdrin <alexander.nozdrin@oracle.com>
      branch nick: mysql-trunk-bugfixing
      timestamp: Tue 2010-12-21 15:23:49 +0300
      message:
        A patch for Bug#59060 (Valgrind warning in Protocol_text::store()).
        
        We should not assume to have zero-terminated strings.
      da51493a
    • Luis Soares's avatar
      DBUG_PRINT in solaris does not work well with NULL parameters. · 770b03f9
      Luis Soares authored
      HA_ERR was returning 0 (null string) when no error happened 
      (error=0). Since HA_ERR is used in DBUG_PRINT, regardless there 
      was an error or not, the server could crash in solaris debug
      builds.
      
      We fix this by:
      
        - deploying an assertion that ensures that the function 
          is not called when no error has happened;
        - making sure that HA_ERR is only called when an error 
          happened;
        - making HA_ERR return "No Error", instead of 0, for 
          non-debug builds if it is called when no error happened.
      
      This will make HA_ERR return values to work with DBUG_PRINT on
      solaris debug builds.
      770b03f9
  9. 14 Jul, 2011 1 commit
    • Luis Soares's avatar
      BUG#11753004: 44360: REPLICATION FAILED · 1b1e1e05
      Luis Soares authored
                        
      The server crashes if it processes table map events that are
      corrupted, especially if they map different tables to the same
      identifier. This could happen, for instance, due to BUG 56226.
                        
      We fix this by checking whether the table map has already been
      mapped before actually applying the event. If it has been mapped
      with different settings an error is raised and the slave SQL
      thread stops. If it has been mapped with same settings the event
      is skipped. If the table is set to be ignored by the filtering
      rules, there is no change in behavior: the event is skipped and
      ids are not checked.
      
      
      mysql-test/suite/rpl/t/rpl_row_corruption.test:
        Added a simple test case that checks both cases:
        - multiple table maps with the same identifier
        - multiple table maps with the same identifier, but only one
          is processed (the others are filtered out)
      1b1e1e05
  10. 12 Jul, 2011 3 commits
    • Tatjana Azundris Nuernberg's avatar
      Bug#11758414/Bug#50614: Default storage_engine not honored when set from within a stored procedure · 716963d2
      Tatjana Azundris Nuernberg authored
      When CREATE TABLE wasn't given ENGINE=... it would determine
      the default ENGINE at parse-time rather than at execution
      time, leading to incorrect behaviour (namely, later changes
      to the default engine being ignore) when calling CREATE TABLE
      from a stored procedure.
      
      We now defer working out the default engine till execution of
      CREATE TABLE.
      
      
      mysql-test/r/sp_trans.result:
        results!
      mysql-test/t/sp_trans.test:
        Show that CREATE TABLE (called from store routine) heeds
        any changes after CREATE SP / parse-time. Show that explicitly
        requesting an ENGINE still works.
      sql/sql_parse.cc:
        If no ENGINE=... was given at parse-time, determine default
        engine at execution time of CREATE TABLE.
      sql/sql_yacc.yy:
        If CREATE TABLE is not given ENGINE=..., don't bother
        figuring out the default engine during parsing; we'll
        do it at execution time instead to be aware of the
        latest updates.
      716963d2
    • Luis Soares's avatar
      BUG#12695969 · 9c4287f4
      Luis Soares authored
      Manually merged from mysql-5.0 into mysql-5.1.
      
      conflicts
      =========
      
      include/Makefile.am
      9c4287f4
    • Luis Soares's avatar
      BUG#12695969 · 34d33506
      Luis Soares authored
      Follow-up patch that adds the newly added header file to
      Makefile.am noinst_HEADERS.
      34d33506
  11. 11 Jul, 2011 2 commits
    • Luis Soares's avatar
      BUG#12695969 · 39f76b60
      Luis Soares authored
      Manually merged mysql-5.0 into mysql-5.1.
      
      conflicts
      =========
      client/mysqlibinlog.cc
      39f76b60
    • Luis Soares's avatar
      BUG#12695969: FIX OUTDATED COPYRIGHT NOTICES IN REPLACTION · fac2ec36
      Luis Soares authored
      CLIENT TOOLS
            
      The fix is to backport part of revision:
              
        - alexander.nozdrin@oracle.com-20101006150613-ls60rb2tq5dpyb5c
            
      from mysql-5.5. In detail, we add the oracle welcome notice
      header file proposed in the original patch and include/use it
      in client/mysqlbinlog.cc, replacing the existing and obsolete
      notice.
      fac2ec36
  12. 07 Jul, 2011 3 commits
    • unknown's avatar
      Bug#12637786 was fixed with rb:692 by marko. But that fix has a remaining · be4b8c6d
      unknown authored
      bug.  It added this assert;
          ut_ad(ind_field->prefix_len);
      before a section of code that assumes there is a prefix_len.  
      
      The patch replaced code that explicitly avoided this with a check for
      prefix_len.  It turns out that the purge thread can get to that assert
      without a prefix_len because it does not use a row_ext_t* .
      When UNIV_DEBUG is not defined, the affect of this is that the purge thread
      sets the dfield->len to zero and then cannot find the entry in the index to
      purge.  So secondary index entries remain unpurged.
      
      This patch does not do the assert.  Instead, it uses
          'if (ind_field->prefix_len) {...}'
      around the section of code that assumes a prefix_len.  This is the way the
      patch I provided to Marko did it.
      
      The test case is simply modified to do a sleep(10) in order to give the
      purge thread a chance to run. Without the code change to row0row.c, this
      modified testcase will assert if InnoDB was compiled with UNIV_DEBUG.
      I tried to sleep(5), but it did not always assert.
      be4b8c6d
    • Joerg Bruehe's avatar
      Fix bug#45415: "rpm upgrade recreates test database" · 622fb276
      Joerg Bruehe authored
      Let the creation of the "test" database happen only during a new
      installation, not in an RPM upgrade.
      622fb276
    • Georgi Kodinov's avatar
      empty weave merge from mysql-5.0 · f1873a16
      Georgi Kodinov authored
      f1873a16
  13. 06 Jul, 2011 1 commit
  14. 05 Jul, 2011 1 commit
  15. 04 Jul, 2011 2 commits
  16. 03 Jul, 2011 2 commits
  17. 01 Jul, 2011 3 commits
  18. 30 Jun, 2011 3 commits
  19. 29 Jun, 2011 4 commits
    • Bjorn Munch's avatar
      merge from 5.1 main · 49944669
      Bjorn Munch authored
      49944669
    • Vasil Dimov's avatar
      Merge mysql-5.0 -> mysql-5.1 · e20cc086
      Vasil Dimov authored
      e20cc086
    • Vasil Dimov's avatar
      Bug #12696083 FIX OUTDATED COPYRIGHT NOTICES IN INNODB RELATED CLIENT TOOLS · 9b60e6a6
      Vasil Dimov authored
      Update copyright comment in innochecksum.
      9b60e6a6
    • Marko Mäkelä's avatar
      Bug #12612184 BLOB debug code cleanup: · 487c15e4
      Marko Mäkelä authored
      Refactor the !rec_offs_any_extern relaxation in row_build().
      
      trx_assert_active(trx_id): Assert that the given transaction is active.
      (In the 5.1 built-in InnoDB, there is no trx->is_recovered field.)
      
      trx_assert_recovered(trx_id): Assert that the given transaction is
      active and has been recovered after a crash.
      
      row_build(): Replace a bunch of code with an assertion that invokes
      trx_assert_active() or trx_assert_recovered() and row_get_rec_trx_id().
      
      row_get_trx_id_offset(): Make the function inlined. Remove the unused
      parameter rec, and make all parameters const.
      
      row_get_rec_trx_id(), row_get_rec_roll_ptr(): Make all parameters const.
      
      rb:691 approved by Jimmy Yang
      487c15e4
  20. 28 Jun, 2011 1 commit
    • Marko Mäkelä's avatar
      Bug#12595087 - 61191: Question about page_zip_available (clean up page0zip.c) · e8ad0690
      Marko Mäkelä authored
      page_zip_dir_elems(): New function, refactored from page_zip_dir_size().
      
      page_zip_dir_size(): Use page_zip_dir_elems()
      
      page_zip_dir_start_offs(): New function: Gets an offset to the
      compressed page trailer (the dense page directory), including deleted
      records (the free list)
      
      page_zip_dir_start_low(page_zip, n_dense): Constness-preserving
      wrapper macro for page_zip_dir_start_offs().
      
      page_zip_dir_start(page_zip): Constness-preserving
      wrapper macro for page_zip_dir_start_offs().
      
      page_zip_decompress_node_ptrs(), page_zip_decompress_clust(): Replace
      a formula with a fully equivalent page_zip_dir_start_low() call.
      
      page_zip_write_rec(), page_zip_parse_write_node_ptr(),
      page_zip_write_node_ptr(), page_zip_write_trx_id_and_roll_ptr(),
      page_zip_clear_rec(): Replace a formula with an almost equivalent
      page_zip_dir_start() call.
      It is OK to replace page_dir_get_n_heap(page) with
      page_dir_get_n_heap(page_zip->data), because
      ut_ad(page_zip_header_cmp(page_zip, page)) or
      page_zip_validate(page_zip, page) asserts that the
      page headers are identical.
      
      rb:687 approved by Jimmy Yang
      e8ad0690