1. 10 Aug, 2011 4 commits
    • Marko Mäkelä's avatar
      Merge from mysql-5.5 to local tree. · 20f6da0a
      Marko Mäkelä authored
      20f6da0a
    • Vinay Fisrekar's avatar
      Committing Change On behalf Of Sneha Modi · 24b4f40b
      Vinay Fisrekar authored
      Bug#12664445 - SYS_VARS.ALL_VARS: WRONG RESULTS RECORDED IN RESULT FILE - TEST CASES MISSING! 
            
      The bug had missing test cases for three system variables. 
      Test cases have been added for these variables:
      'INNODB_FILE_FORMAT_MAX' 
      'INNODB_ROLLBACK_SEGMENTS'
      'INNODB_STATS_METHOD'
            
      The 'sys_vars.all_vars' result file now looks like this:
            
      select variable_name as `There should be *no* variables listed below:` from t2
      left join t1 on variable_name=test_name where test_name is null;
      There should be *no* variables listed below:
            
      INNODB_LARGE_PREFIX
      INNODB_LARGE_PREFIX
            
      The variable 'INNODB_LARGE_PREFIX' is a newly added variable for MySQL 5.6.3 and the test will be added later by the developer.
      24b4f40b
    • Marko Mäkelä's avatar
      Merge mysql-5.1 to mysql-5.5. · aac279c5
      Marko Mäkelä authored
      aac279c5
    • Marko Mäkelä's avatar
      Bug#12835650 VARCHAR maximum length performance impact · 1ba7ae75
      Marko Mäkelä authored
      row_sel_field_store_in_mysql_format(): Do not pad the unused part of
      the buffer reserved for a True VARCHAR column (introduced in 5.0.3).
      Add Valgrind instrumentation ensuring that the unused part will be
      flagged uninitialized.
      
      row_sel_copy_cached_field_for_mysql(): New function: Copy a field
      that is in the MySQL row format, not copying the unused tail of
      VARCHAR columns.
      
      row_sel_pop_cached_row_for_mysql(): Invoke
      row_sel_copy_cached_field_for_mysql() for copying fields.
      When the row is long, copy it field-by-field.
      
      rb:715 approved by Inaam Rana
      1ba7ae75
  2. 08 Aug, 2011 3 commits
  3. 05 Aug, 2011 1 commit
  4. 03 Aug, 2011 1 commit
    • Gleb Shchepa's avatar
      backport from mysql-trunk · 1392945b
      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.
      1392945b
  5. 02 Aug, 2011 2 commits
  6. 28 Jul, 2011 1 commit
  7. 27 Jul, 2011 5 commits
  8. 24 Jul, 2011 1 commit
    • Alfranio Correia's avatar
      Post-push fix for BUG#11809016. · f2c7452f
      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.
      f2c7452f
  9. 22 Jul, 2011 5 commits
    • Dmitry Lenev's avatar
      Fix for bug #11754210 - "45777: CHECK TABLE DOESN'T · 9fe60b4d
      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.
      9fe60b4d
    • Sunanda Menon's avatar
      c8519150
    • Alexander Nozdrin's avatar
      Manual merge from mysql-5.1. · f636987d
      Alexander Nozdrin authored
      f636987d
    • Alexander Nozdrin's avatar
      Manual merge from mysql-5.0. · c4dad60a
      Alexander Nozdrin authored
      c4dad60a
    • Alexander Nozdrin's avatar
      For for Bug#12696072: FIX OUTDATED COPYRIGHT NOTICES IN RUNTIME RELATED CLIENT · f7618904
      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.
      f7618904
  10. 21 Jul, 2011 1 commit
    • Jon Olav Hauglid's avatar
      Bug#12779790 COMPILATION FAILS OS X 10.7 - IMPLICIT DECLARATION OF · 96a2bbcb
      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.
      96a2bbcb
  11. 20 Jul, 2011 3 commits
  12. 19 Jul, 2011 3 commits
  13. 18 Jul, 2011 6 commits
  14. 15 Jul, 2011 4 commits