1. 18 Sep, 2014 5 commits
  2. 17 Sep, 2014 2 commits
    • Sergei Golubchik's avatar
      fixes for valgrind failures · c338772a
      Sergei Golubchik authored
      sql/item.cc:
        don't forget to adjust the length of the string when removing leading spaces
      sql/sql_acl.cc:
        when updating the hostname of the ACL_USER, update the hostname_length too
      sql/sql_parse.cc:
        first compare the username string, then test the host pointer
        (host pointer is undefined when the username string is one of the hard-coded values
        set by the parser). This is not a bug, old code is perfectly safe as the undefined
        host pointer is never dereferenced, but let's keep valgrind happy.
      c338772a
    • Sergei Golubchik's avatar
      fix intermittent failures of main.create_or_replace test in buildbot · b04748c8
      Sergei Golubchik authored
      don't kill statements in the default connection, kill them in a connection that
      will be closed - it'll guarantee that `KILL con_id` will not apply to unrelated statements.
      b04748c8
  3. 16 Sep, 2014 5 commits
  4. 15 Sep, 2014 6 commits
    • Michael Widenius's avatar
      Auto merge · 8db1f728
      Michael Widenius authored
      8db1f728
    • Michael Widenius's avatar
      Don't give warning if there are two unique keys used with INSERT .. ON DUPLICATE KEY UPDATE. · 8e4566e9
      Michael Widenius authored
      We should assume that the store engine will report the first duplicate key for this case.
      
      Old code of suppression of unsafe logging error with LIMIT didn't work, because of wrong usage of my_interval_timer().
      
      Suppress unsafe logging errors to the error log if we get too many unsafe logging errors in a short time.
      This is to not overflow the error log with meaningless errors.
      
      - Each error code is suppressed and counted separately.
      - We do a 5 minute suppression of new errors if we get more than 10 errors in that time.
      
      Only print unsafe logging errors if log_warnings > 1.
      
      
      
      mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result:
        Update test results as INSERT ... ON DUPLICATE KEY UPDATE doesn't get logged anymore
      mysql-test/suite/binlog/r/binlog_unsafe.result:
        Update test results as INSERT ... ON DUPLICATE KEY UPDATE doesn't get logged anymore
      mysql-test/suite/engines/README:
        Fixed typos
      mysql-test/suite/rpl/r/rpl_known_bugs_detection.result:
        Update test results as INSERT ... ON DUPLICATE KEY UPDATE doesn't get logged anymore
      sql/sql_base.cc:
        Don't log warning if there are two unique keys used with INSERT .. ON DUPLICATE KEY UPDATE.
        We should assume that the store engine will report the first duplicate key for this case.
      sql/sql_class.cc:
        Suppress error in binary log if we get too many unsafe logging errors in a short time.
        Only print unsafe logging errors if log_warnings > 1
      8e4566e9
    • Michael Widenius's avatar
      Fixed randomly failing test · e167c48a
      Michael Widenius authored
      e167c48a
    • Sergei Golubchik's avatar
    • Elena Stepanova's avatar
      Changes in storage_engine test suite: · b41d5aeb
      Elena Stepanova authored
        - added more logic for ON DUPICATE KEY UPDATE upon Monty's request;
        - added an overlay for XtraDB
      b41d5aeb
    • Michael Widenius's avatar
      Use LOCK_show_status when we add things to all_status_vars · 7a50ce1d
      Michael Widenius authored
      This was missing in my last commit for fixing possible lockups in SHOW STATUS.
      
      sql/log.cc:
        Fixed comment
      sql/sql_show.cc:
        Use LOCK_show_status when we add things to all_status_vars
      sql/sql_test.cc:
        Remove not needed mutex_lock
      7a50ce1d
  5. 13 Sep, 2014 4 commits
  6. 12 Sep, 2014 12 commits
  7. 11 Sep, 2014 6 commits
    • Elena Stepanova's avatar
      Fixes in storage_engine test suite · d2ae40ac
      Elena Stepanova authored
        - after a change in 5.6.20, tests with big blobs require bigger
          innodb_log_file_size value;
        - innobase relay was running with the default InnoDB (XtraDB)
      d2ae40ac
    • Michael Widenius's avatar
      Automatic merge · c6051a4b
      Michael Widenius authored
      c6051a4b
    • Michael Widenius's avatar
      MDEV-6255 DUPLICATE KEY Errors on SELECT .. GROUP BY that uses temporary and filesort. · c4f5326b
      Michael Widenius authored
      The problem was that my_hash_sort didn't properly delete end-space characters properly, so strings that should compare
      identically was seen as different strings.  (Space was handled correctly, but not NBSP)
      This caused duplicate key errors when a heap table was converted to Aria as part of overflow in group by.
      
      Fixed by removing all characters that compares as end space when creating a hash.
      
      Other things:
      - Fixed that --sorted_results also works for errors in mysqltest.
      - Speed up hash by not comparing strings that has different hash.
      - Speed up many my_hash_sort functions by using registers to calculate hash instead of pointers.
        This was previously done for some functions, but not for all.
      - Made a macro of the hash function, to simplify code and to be able to experiment with new hash functions.
      
      
      
      
      
      
      
      client/mysqltest.cc:
        Fixed that --sorted_results also works for error messages.
      mysql-test/r/ctype_partitions.result:
        New test to ensure that partitions on hash works
      mysql-test/suite/multi_source/gtid.result:
        Updated result
      mysql-test/suite/multi_source/gtid.test:
        Test that --sorted_result works for error messages
      mysql-test/suite/multi_source/gtid_ignore_duplicates.result:
        Updated result
      mysql-test/suite/multi_source/gtid_ignore_duplicates.test:
        Updated result
      mysql-test/suite/multi_source/load_data.result:
        Updated result
      mysql-test/suite/multi_source/load_data.test:
        Updated result
      mysql-test/t/ctype_partitions.test:
        New test to ensure that partitions on hash works
      storage/heap/hp_write.c:
        Speed up hash by not comparing strings that has different hash.
      storage/maria/ma_check.c:
        Extra debug
      strings/ctype-bin.c:
        Use macro for hash function
      strings/ctype-latin1.c:
        Use macro for hash function
        Use registers to calculate hash (speedup)
      strings/ctype-mb.c:
        Use macro for hash function
        Use registers to calculate hash (speedup)
      strings/ctype-simple.c:
        Use macro for hash function
        Use same variable names as in other my_hash_sort functions.
        Update my_hash_sort_simple() to properly remove end space (patch by Bar)
      strings/ctype-uca.c:
        Ignore duplicated space inside strings and end space in my_hash_sort_uca(). This fixed MDEV-6255
        Use macro for hash function
        Use registers to calculate hash (speedup)
      strings/ctype-ucs2.c:
        Use macro for hash function
        Use registers to calculate hash (speedup)
      strings/ctype-utf8.c:
        Use macro for hash function
        Use registers to calculate hash (speedup)
      strings/strings_def.h:
        Made a macro of the hash function, to simplify code and to be able to experiment with new hash functions.
      c4f5326b
    • Sergei Golubchik's avatar
      XtraDB 5.6.20-68.0 · 4a68817d
      Sergei Golubchik authored
      4a68817d
    • Sergei Golubchik's avatar
      InnoDB 5.6.20 · 75796d9e
      Sergei Golubchik authored
      75796d9e
    • Jan Lindström's avatar
      MDEV-6729: InnoDB: Failing assertion: state == TRX_STATE_NOT_STARTED in · c30a8442
      Jan Lindström authored
      file trx0trx.ic line 60 
      
      Problem was that trx might have not been started when we enter release
      savepoint, this can happen when trx with savepoint is already aborted 
      or when we try to release non-existing savepoint.
      c30a8442