1. 27 Jan, 2011 3 commits
  2. 26 Jan, 2011 3 commits
    • unknown's avatar
      Merge three Percona patches into mariadb-5.2-rpl: · 9242f0b7
      unknown authored
       - MWL#47, allowing to annotate row-based binlog events with the SQL test of
         the originating query (eg. in mysqlbinlog output).
      
       - row_based_replication_without_primary_key.patch, providing more intelligent
         selection of index to use on slave when applying row-based binlog events
         for tables with no primary key.
      
       - Make mysqlbinlog omit redundant `use` around BEGIN/SAVEPOINT/COMMIT/
         ROLLBACK in 5.0 binlogs.
      9242f0b7
    • unknown's avatar
      Fix wrong printf() format. · 15ab7817
      unknown authored
      15ab7817
    • unknown's avatar
      Fix incorrect DBUG_ASSERT(). · f9eb1ce3
      unknown authored
      f9eb1ce3
  3. 13 Jan, 2011 1 commit
    • unknown's avatar
      Make mysqlbinlog omit redundant `use` around BEGIN/SAVEPOINT/COMMIT/ROLLBACK in 5.0 binlogs · 090307f7
      unknown authored
      This is a merge of percona patch mysqlbinlog_fix.patch.
      
      Apparently, MySQL 5.0 does not flag BEGIN/SAVEPOINT/COMMIT/ROLLBACK statements
      in its binlogs with LOG_EVENT_SUPPRESS_USE_F like 5.1+ does. This causes
      unnecessary `use` statements around such statements when the binlog is dumped
      by mysqlbinlog.
      
      Fix by always suppressing the output of `use` for these statements.
      090307f7
  4. 11 Jan, 2011 1 commit
  5. 10 Jan, 2011 2 commits
  6. 06 Jan, 2011 1 commit
  7. 31 Dec, 2010 1 commit
    • Sergei Golubchik's avatar
      virtual columns: · ee740f95
      Sergei Golubchik authored
       * move a capability from a virtual handler method to table_flags()
       * rephrase error messages to avoid hard-coded English parts
       * admit in test cases that they need xtradb, not innodb
      
      mysql-test/suite/vcol/t/rpl_vcol.test:
        this test needs xtradb, it will fail with innodb
      mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_innodb.test:
        this test needs xtradb, it will fail with innodb
      mysql-test/suite/vcol/t/vcol_column_def_options_innodb.test:
        this test needs xtradb, it will fail with innodb
      mysql-test/suite/vcol/t/vcol_handler_innodb.test:
        this test needs xtradb, it will fail with innodb
      mysql-test/suite/vcol/t/vcol_ins_upd_innodb.test:
        this test needs xtradb, it will fail with innodb
      mysql-test/suite/vcol/t/vcol_keys_innodb.test:
        this test needs xtradb, it will fail with innodb
      mysql-test/suite/vcol/t/vcol_non_stored_columns_innodb.test:
        this test needs xtradb, it will fail with innodb
      mysql-test/suite/vcol/t/vcol_partition_innodb.test:
        this test needs xtradb, it will fail with innodb
      mysql-test/suite/vcol/t/vcol_select_innodb.test:
        this test needs xtradb, it will fail with innodb
      mysql-test/suite/vcol/t/vcol_supported_sql_funcs_innodb.test:
        this test needs xtradb, it will fail with innodb
      mysql-test/suite/vcol/t/vcol_trigger_sp_innodb.test:
        this test needs xtradb, it will fail with innodb
      mysql-test/suite/vcol/t/vcol_view_innodb.test:
        this test needs xtradb, it will fail with innodb
      sql/ha_partition.h:
        check_if_supported_virtual_columns() -> HA_CAN_VIRTUAL_COLUMNS
      sql/handler.h:
        check_if_supported_virtual_columns() -> HA_CAN_VIRTUAL_COLUMNS
      sql/share/errmsg.txt:
        no hard-coded english parts in the error messages (ER_UNSUPPORTED_ACTION_ON_VIRTUAL_COLUMN)
      sql/sql_table.cc:
        no hard-coded english parts in the error messages
      sql/table.cc:
        * check_if_supported_virtual_columns() -> HA_CAN_VIRTUAL_COLUMNS
        * no "csv workaround" is needed
        * no hard-coded english parts in the error messages
      storage/maria/ha_maria.cc:
        check_if_supported_virtual_columns() -> HA_CAN_VIRTUAL_COLUMNS
      storage/maria/ha_maria.h:
        check_if_supported_virtual_columns() -> HA_CAN_VIRTUAL_COLUMNS
      storage/myisam/ha_myisam.cc:
        check_if_supported_virtual_columns() -> HA_CAN_VIRTUAL_COLUMNS
      storage/myisam/ha_myisam.h:
        check_if_supported_virtual_columns() -> HA_CAN_VIRTUAL_COLUMNS
      storage/xtradb/handler/ha_innodb.cc:
        check_if_supported_virtual_columns() -> HA_CAN_VIRTUAL_COLUMNS
      storage/xtradb/handler/ha_innodb.h:
        check_if_supported_virtual_columns() -> HA_CAN_VIRTUAL_COLUMNS
      ee740f95
  8. 27 Dec, 2010 2 commits
    • unknown's avatar
      Merge Percona patch row_based_replication_without_primary_key.patch into MariaDB. · bc27b745
      unknown authored
      This patch improves the selection of index to use to apply row-based
      DELETE and UPDATE events on tables with no primary key (original code
      picks the first index unconditionally).
      If ANALYZE TABLE is done, the index cardinalities will be compared and
      the best index will be used.
      
      Fixes some problems in the original patch:
      
       - Without ANALYZE TABLE, rec_per_key statistics is not available; in this
         case the original patch could choose a really bad index, even ignoring
         a primary key.
      
       - The original patch did not consider multi-column keys correctly, and
         could thus pick a less desirable single-column key over a good
         multi-column index.
      
      Also fixes Bug#58997, and adds test cases.
      bc27b745
    • Sergei Golubchik's avatar
      lpbug#665028 SHOW STORAGE ENGINES shows incorrect Transaction support for Aria · 0e1381d8
      Sergei Golubchik authored
      don't fill in handlerton::commit member, as it's not used
      and makes MySQL believe that Aria is transactional.
      Fix the TRANSACTIONAL=1 warning.
      0e1381d8
  9. 25 Dec, 2010 3 commits
  10. 20 Dec, 2010 1 commit
  11. 17 Dec, 2010 1 commit
  12. 13 Dec, 2010 3 commits
    • Michael Widenius's avatar
      merge with 5.1 · f6f8d832
      Michael Widenius authored
      (Includes patch for overrun detected by valgrind thanks to previous my_alloca() -> my_malloc() patch)
      f6f8d832
    • Michael Widenius's avatar
      Fixed typo that caused compile failure in thr_lock.c · 91bdcb20
      Michael Widenius authored
      mysys/thr_lock.c:
        Fixed typo that caused compile failure
      91bdcb20
    • Michael Widenius's avatar
      When compiling with valgrind, change my_alloca() to use my_malloc() · dd9d6756
      Michael Widenius authored
      - This allows us to detect missing my_afree() calls and also find overruns (when running with valgrind) to alloca() areas.
      - Added missing my_afree() calls
      - Fixed wrong call to my_afree()
      
      
      include/my_sys.h:
        When compiling with valgrind, change my_alloca() to use my_malloc()
      mysql-test/suite/innodb/t/innodb_bug57255.test:
        Speed up taste case (patch from Stewart Smith)
      mysql-test/suite/innodb_plugin/t/innodb_bug57255.test:
        Speed up taste case (patch from Stewart Smith)
      sql/ha_partition.cc:
        Removed casts from my_afree()
      sql/opt_range.cc:
        Add missing my_afree() calls.
      storage/maria/ma_rt_split.c:
        Fixed wrong parameter to my_afree()
      dd9d6756
  13. 10 Dec, 2010 3 commits
    • Michael Widenius's avatar
      Fix for Lbug:#686010 maria.optimize corrupts stack around alloca() call · 4bb42c4e
      Michael Widenius authored
      
      storage/maria/ma_check.c:
        Allocate also memory for nodflag and transid's
      storage/maria/ma_write.c:
        Allow nodflag and transid as part of key.
        (This has nothing to do with the bug report, but it's a safer check).
      storage/maria/maria_def.h:
        Define MARIA_MAX_POINTER_LENGTH (length of pointer to node)
        Added node pointer length to MARIA_INDEX_OVERHEAD_SIZE, as this is part of the key.
        (Safety fix)
      4bb42c4e
    • Michael Widenius's avatar
      Better warning message if lock test fails · b0312896
      Michael Widenius authored
      Made archive.test a bit more safe
      
      
      
      mysql-test/r/archive.result:
        Added removal of files to make rerun of failed test work
      mysql-test/t/archive.test:
        Added removal of files to make rerun of failed test work
      mysys/thr_lock.c:
        Better warning message if lock test fails
      b0312896
    • unknown's avatar
      Fix wrong merge of patch for Bug#46639. · a4ed89e3
      unknown authored
      a4ed89e3
  14. 08 Dec, 2010 1 commit
    • unknown's avatar
      MBug#687320: Fix sporadic test failures in innodb_mysql.test and... · 52920994
      unknown authored
      MBug#687320: Fix sporadic test failures in innodb_mysql.test and partition_innodb_semi_consistent.test
      
      Problem is that these tests run with --innodb-lock-wait-timeout=2 in .opt
      (and this is necessary as built-in innodb does not allow to change this
      dynamically). This cases another part of the test to occasionally time
      out an UPDATE, which subsequently caused the test case to timeout due to
      waiting for a condition (successful UPDATE) that never occurs.
      
      Fixed by re-trying the update in case of timeout.
      
      Tested by inserting a sleep() in the connection that the UPDATE is waiting
      for, and checking that the retry loops a couple of times until the other
      connection is done and COMMITs.
      52920994
  15. 07 Dec, 2010 1 commit
  16. 06 Dec, 2010 8 commits
    • Vladislav Vaintroub's avatar
      merge LP Bug#686184 · 2ce6bea9
      Vladislav Vaintroub authored
      2ce6bea9
    • Vladislav Vaintroub's avatar
      Fix myisam_crash_before_flush_keys on Windows · a1abfb58
      Vladislav Vaintroub authored
      Problem : mtr reports test failure because it sees
      [ERROR] mysqld got exception 0x80000003 ;
      in the .err file
      
      The exception comes from DBUG_EXECUTE_IF (.. abort())
      
      Fix:  use DBUG_ABORT instead of abort() - it does not throw 
      any exceptions.
      a1abfb58
    • Vladislav Vaintroub's avatar
      Fix LP Bug#686184 - merge_debug test fails. · cd72b793
      Vladislav Vaintroub authored
      The reason for failure is that DBUG_EXECUTE_IF in mi_open()
      only worked for Unix-formatted file names, due to strstr(name, "/crashed")
      
      The fix change strstr() above to strstr(name, "crashed"), to it can work with 
      Windows file names as well.
      cd72b793
    • Vladislav Vaintroub's avatar
      merge · fdd009f1
      Vladislav Vaintroub authored
      fdd009f1
    • Vladislav Vaintroub's avatar
      merge · 1208fba6
      Vladislav Vaintroub authored
      1208fba6
    • Vladislav Vaintroub's avatar
      Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 · 7a80fa96
      Vladislav Vaintroub authored
       
      Reason: inconsistent compilation, federatedx is compiled without SAFEMALLOC
      flag, while anything else is compiled with SAFEMALLOC.
      
      As a consequence, my_hash_init used inside federatedx initialization does not
      provide correct caller info parameters (file, line) , so they are initialized with 
      whatever is on stack. When info about allocated memory is output in
      COM_DEBUG command, the server crashes trying to output string starting at
      0xcccccccccccccccc.
      
      The fix is to remove SAFEMALLOC  preprocessor flags 
      from every CMakeLists.txt, except the top-level one.
      
      Also, SAFEMALLOC is not defined by default now, instead
      there is WITH_DEBUG_FULL CMake option which adds 
      -DSAFEMALLOC to C and C++ flags in debug compilation. 
      This option is off by  default, because 
      1) Debug C runtime already has heap debugging builtin with 
       overwrite and leak detection
      2)safemalloc considerably slows down the tests.
      
      
      Note also  that 
      - SAFEMALLOC is gone  in MySQL5.5
      - On Windows, heap related overflows can also be found using free pageheap utility
      (that is also part of application verifier). This is even more efficient if there are no other layers 
      on top of Windows heap allocator, e.g  it is most efficient with release version.
      7a80fa96
    • Michael Widenius's avatar
    • Michael Widenius's avatar
      Merge with 5.1-release · 7720092b
      Michael Widenius authored
      7720092b
  17. 05 Dec, 2010 3 commits
    • Michael Widenius's avatar
      Removed compiler warning · 5c43e47b
      Michael Widenius authored
      5c43e47b
    • Michael Widenius's avatar
      merge with 5.1-release · 6ed1f88b
      Michael Widenius authored
      6ed1f88b
    • Michael Widenius's avatar
      Fixes to not trigger end-consistency testing of pagecache. · 420b6312
      Michael Widenius authored
      - Moved end_pagecache() to after maria_close()
      - Flush page cache before closing files (in maria_pack)
      Fixed test suite failure for PBXT
      
      mysql-test/suite/pbxt/r/select.result:
        We mask out the 'rows' column because it may differ from run to run
      mysql-test/suite/pbxt/t/select.test:
        We mask out the 'rows' column because it may differ from run to run
      storage/maria/maria_chk.c:
        Moved end_pagecache() to after maria_close() to not trigger end-consistency testing of pagecache.
      storage/maria/maria_pack.c:
        Moved end_pagecache() to after maria_close() to not trigger end-consistency testing of pagecache.
        flush page cache before closing files.
      420b6312
  18. 04 Dec, 2010 2 commits