1. 08 Aug, 2011 5 commits
  2. 05 Aug, 2011 1 commit
  3. 03 Aug, 2011 1 commit
    • Gleb Shchepa's avatar
      backport from mysql-trunk · 22c2d06d
      Gleb Shchepa authored
      BUG #11754979 - 46675: ON DUPLICATE KEY UPDATE AND UPDATECOUNT() POSSIBLY WRONG 
      
      The mysql_affected_rows() client call returns 3 instead of 2 on
      INSERT ... ON DUPLICATE KEY UPDATE query with a duplicated key value.
      
      The fix for the old bug #29692 was incomplete: unnecessary double
      increment of "touched" rows still happened.
      
      This bugfix removes:
      1) unneeded increment of "touched" rows and
      2) useless double resetting of auto-increment value.
      
      
      sql/sql_insert.cc:
        write_record() function:
        Unneeded increment of "touched" rows and useless double resetting
        of auto-increment value has been removed.
      tests/mysql_client_test.c:
        New test case.
      22c2d06d
  4. 02 Aug, 2011 2 commits
    • Sergey Glukhov's avatar
      5.1 -> 5.5 merge · 53fb954d
      Sergey Glukhov authored
      53fb954d
    • Sergey Glukhov's avatar
      Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUNCTION IN WHERE C · 3468b55a
      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
      3468b55a
  5. 28 Jul, 2011 1 commit
  6. 27 Jul, 2011 5 commits
  7. 24 Jul, 2011 1 commit
    • Alfranio Correia's avatar
      Post-push fix for BUG#11809016. · 111570df
      Alfranio Correia authored
      In 5.5, REFRESH SLAVE is used as an alias for RESET SLAVE and
      was removed in 5.6. Reseting a slave through REFRESH SLAVE was
      causing errors in the valgrind platform since reset_slave_info
      was undefined.
      
      To fix the problem, we have set reset_slave_info while calling
      REFRESH SLAVE.
      111570df
  8. 22 Jul, 2011 5 commits
    • Dmitry Lenev's avatar
      Fix for bug #11754210 - "45777: CHECK TABLE DOESN'T · 0b5b1dd1
      Dmitry Lenev authored
      SHOW ALL PROBLEMS FOR MERGE TABLE COMPLIANCE IN 5.1".
      
      The problem was that CHECK/REPAIR TABLE for a MERGE table which
      had several children missing or in wrong engine reported only
      issue with the first such table in its result-set. While in 5.0
      this statement returned the whole list of problematic tables.
      
      Ability to report problems for all children was lost during
      significant refactorings of MERGE code which were done as part
      of work on 5.1 and 5.5 releases.
      
      This patch restores status quo ante refactorings by changing
      code in such a way that:
      1) Failure to open child table due to its absence during CHECK/
         REPAIR TABLE for a MERGE table is not reported immediately
         when its absence is discovered in open_tables(). Instead
         handling/error reporting in such a situation is postponed
         until the moment when children are attached.
      2) Code performing attaching of children no longer stops when
         it encounters first problem with one of the children during
         CHECK/REPAIR TABLE. Instead it continues iteration through
         the child list until all problems caused by child absence/
         wrong engine are reported.
      
      Note that even after this change problem with mismatch of
      child/parent definition won't be reported if there is also
      another child missing, but this is how it was in 5.0 as well.
      
      mysql-test/r/merge.result:
        Added test case for bug #11754210 - "45777: CHECK TABLE DOESN'T
        SHOW ALL PROBLEMS FOR MERGE TABLE COMPLIANCE IN 5.1".
        Adjusted results of existing tests to the fact that CHECK/REPAIR
        TABLE statements now try to report problems about missing table/
        wrong engine for all underlying tables, and to the fact that
        mismatch of parent/child definitions is always reported as an
        error and not a warning.
      mysql-test/t/merge.test:
        Added test case for bug #11754210 - "45777: CHECK TABLE DOESN'T
        SHOW ALL PROBLEMS FOR MERGE TABLE COMPLIANCE IN 5.1".
      sql/sql_base.cc:
        Changed code responsible for opening tables to ignore the fact
        that underlying tables of a MERGE table are missing, if this
        table is opened for CHECK/REPAIR TABLE.
        The absence of underlying tables in this case is now detected and
        appropriate error is reported at the point when child tables are
        attached. At this point we can produce full list of problematic
        child tables/errors to be returned as part of CHECK/REPAIR TABLE
        result-set.
      storage/myisammrg/ha_myisammrg.cc:
        Changed myisammrg_attach_children_callback() to handle new
        situation, when during CHECK/REPAIR TABLE we do not report 
        error about missing child immediately when this fact is 
        discovered during open_tables() but postpone error-reporting
        till the time when children are attached. 
        Also this callback is now responsible for pushing an error
        mentioning problematic child table to the list of errors to 
        be reported by CHECK/REPAIR TABLE statements.
        Finally, since now myrg_attach_children() no longer relies on
        return value from callback to determine the end of the children
        list, callback no longer needs to set my_errno value and can
        be simplified.
        
        Changed myrg_print_wrong_table() to always report a problem
        with child table as an error and not as a warning. This makes
        reporting for different types of issues with child tables
        more consistent and compatible with 5.0 behavior.
      storage/myisammrg/myrg_open.c:
        Changed code in myrg_attach_children() not to abort on the
        first problem with a child table when attaching children to
        parent MERGE table during CHECK/REPAIR TABLE statement 
        execution. This allows CHECK/REPAIR TABLE to report problems 
        about absence/wrong engine for all underlying tables as
        part of their result-set.
      0b5b1dd1
    • Sunanda Menon's avatar
      bcb4a861
    • Alexander Nozdrin's avatar
      Manual merge from mysql-5.1. · 93126975
      Alexander Nozdrin authored
      93126975
    • Alexander Nozdrin's avatar
      Manual merge from mysql-5.0. · 3a786df2
      Alexander Nozdrin authored
      3a786df2
    • Alexander Nozdrin's avatar
      For for Bug#12696072: FIX OUTDATED COPYRIGHT NOTICES IN RUNTIME RELATED CLIENT · cb523995
      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.
      cb523995
  9. 21 Jul, 2011 1 commit
    • Jon Olav Hauglid's avatar
      Bug#12779790 COMPILATION FAILS OS X 10.7 - IMPLICIT DECLARATION OF · aee88a4c
      Jon Olav Hauglid authored
                   FUNCTION 'PTHREAD_INIT' 
      
      The problem was that compilation would fail with a warning:
      Implicit declaration of function 'pthread_init' if MySQL was
      compiled on OS X 10.7 (Lion). The reason was that pthread_init()
      is now part of an internal OS X pthread library so it was found
      by CMake.
      
      This patch fixes the problem by removing HAVE_PTHREAD_INIT and
      related code. pthread_init() was specific to MIT-pthreads which
      has not been supported since 4.1 and was therefore no longer
      relevant.
      
      No test case added.
      aee88a4c
  10. 20 Jul, 2011 3 commits
  11. 19 Jul, 2011 3 commits
  12. 18 Jul, 2011 6 commits
    • Alfranio Correia's avatar
      BUG#11809016 - NO WAY TO DISCOVER AN INSTANCE IS NO LONGER A SLAVE FOLLOWING MYSQL BUG#28796 · e94de17f
      Alfranio Correia authored
      Before BUG#28796, an empty host was used to identify that an instance was no
      longer a slave. However, BUG#28796 changed this behavior and one cannot set
      an empty host. Besides, a RESET SLAVE only cleans up information on the next
      event to retrieve from the master, disables ssl and resets heartbeat period.
      So a call to SHOW SLAVE STATUS after issuing a RESET SLAVE still returns some
      valid information, such as host, port, user and password.
      
      To fix this problem, we have introduced the command RESET SLAVE ALL that does
      what a regular RESET SLAVE does and also clears host, port, user and password
      information thus allowing users to identify when an instance is no longer a
      slave.
      e94de17f
    • Bjorn Munch's avatar
      null upmerge · 704dcf8a
      Bjorn Munch authored
      704dcf8a
    • Bjorn Munch's avatar
      merge from 5.5-mtr · 9d209fcd
      Bjorn Munch authored
      9d209fcd
    • Tor Didriksen's avatar
      Bug#12711164 - 61676: RESULT OF DIV WITH DECIMAL AND INTEGER DOES NOT MAKE SENSE · d72fefe9
      Tor Didriksen authored
      Truncate result of decimal division before converting to integer.
      
      
      mysql-test/r/func_math.result:
        New test case.
      mysql-test/t/func_math.test:
        New test case.
      sql/item_func.cc:
        Item_func_int_div::val_int():
        Truncate result of decimal division before converting to integer.
      d72fefe9
    • Bjorn Munch's avatar
      merge from 5.1-mtr · 0f543e8e
      Bjorn Munch authored
      0f543e8e
    • Tor Didriksen's avatar
      Bug#12537160 ASSERTION FAILED: STOP0 <= &TO->BUF[TO->LEN] WITH LARGE NUMBER. · 1a02a372
      Tor Didriksen authored
      Turns out the DBUG_ASSERT added by fix for Bug#11792200 was overly pessimistic:
      'stop0' is used in the main loop of do_div_mod, but we only dereference 'buf0'
      for div operations, not for mod.
      
      
      mysql-test/r/func_math.result:
        New test case.
      mysql-test/t/func_math.test:
        New test case.
      strings/decimal.c:
        Move DBUG_ASSERT down to where we actually dereference the loop pointer.
      1a02a372
  13. 15 Jul, 2011 6 commits