1. 10 Dec, 2010 2 commits
  2. 09 Dec, 2010 1 commit
    • Igor Babaev's avatar
      Addemdum for bug #685952. · 065a0044
      Igor Babaev authored
      Also:
      Changed the value of TIME_FOR_COMPARE_ROWID to make it the same as for MWL 21.
      Changed some queries in range_vs_index_merge.test to make them generate
      the same plans as earlier.
      
      065a0044
  3. 08 Dec, 2010 4 commits
  4. 07 Dec, 2010 2 commits
    • Igor Babaev's avatar
      Made sure that SELECT from the test case for bug BUG#56862/64041 uses · 8b5d491f
      Igor Babaev authored
      the same execution plan that is in the output of the corresponding
      EXPLAIN.
      8b5d491f
    • Igor Babaev's avatar
      Fixed LP bug #685952. · 6aa826f8
      Igor Babaev authored
      When ORing two AND-OR formulas the range optimizer could miss
      a conjunct in one of AND-OR formulas in the result. If the
      index merge union plan to access a table is formed by this 
      formula that, in general, is not inferred from the original
      where/on condition,the query could return an incorrect result set.
       
      6aa826f8
  5. 06 Dec, 2010 3 commits
  6. 05 Dec, 2010 2 commits
    • Igor Babaev's avatar
      Fixed LP bug#684086. · 77eafab5
      Igor Babaev authored
      If a primary key was used in the index intersection for
      an InnoDB database the size of the memory allocated
      for the best index intersection plan was one element less
      than it was needed. That could cause a memory overwrite
      and a crash as a result of it.
        
      77eafab5
    • Igor Babaev's avatar
      Fixed LP bug #684117. · 3bf6e7ba
      Igor Babaev authored
      A crash may happenin the cases when the range optimizer tried to OR
      two index merge such that the second one contained less range trees
      than the first one.
      The bug was introduced by the patch of MWL#24: 
      "index_merge: fair choice between index_merge union and range access".
      3bf6e7ba
  7. 04 Dec, 2010 7 commits
  8. 03 Dec, 2010 1 commit
    • Michael Widenius's avatar
      Fixed compiler warnings. · 60f42a46
      Michael Widenius authored
      Fixed timing test failures.
      Fixed a failure in the Aria engines page cache and log handler (found with maria.maria-big test)
      - This could cause a core dump when deleting big blobs.
      - Added test to end_pagecache() to verify that page cache was correctly used.
        - inc_counter_for_resize_op and dec_counter_for_resize_op are called same number of times.
        - All page cache blocks was properly deallocated (empty)
      
      
      mysql-test/suite/innodb/t/innodb_bug38231.test:
        Fixed timing issue (code comment says it all)
      mysql-test/suite/innodb_plugin/t/innodb_bug38231.test:
        Fixed timing issue (code comment says it all)
      sql/debug_sync.cc:
        Fixed compiler warning
      storage/maria/ma_loghandler.c:
        Fixed bug found by maria.maria-big test:
        - Fixed race condition between update thread logging a very big blog and checkpoint thread.
      storage/maria/ma_pagecache.c:
        Added assert to ensure mutex was properly locked.
        Added test to end_pagecache() to verify that page cache was correctly used.
        - inc_counter_for_resize_op and dec_counter_for_resize_op are called same number of times.
        - All page cache blocks was properly deallocated (empty)
        In pagecache_delete_internal(), properly reset counters and pins if functions aborts.
        Added missing inc_counter_for_resize_op() to pagecache_wait_lock().
        Added missing dec_counter_for_resize_op() to pagecache_delete()
      60f42a46
  9. 02 Dec, 2010 4 commits
  10. 01 Dec, 2010 4 commits
    • Vladislav Vaintroub's avatar
      Adapt fix_vs_config_dir () for VS2010 · 0cb30e31
      Vladislav Vaintroub authored
       
      MTR_VS_CONFIG is now determined by looking at parent directory 
      of sql\*\mysqld.exe,  instead of looking at *\*\BuildLog.htm
      
      Reason : VS2010 does not create BuildLog.htm, hence prior method did not work.
      0cb30e31
    • Vladislav Vaintroub's avatar
      Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warnings · 56784da3
      Vladislav Vaintroub authored
        -  Remove all mentioning of /MAP /MAPINFO link options (does not work in VS2010).
           Remove map files from packaging.
        -  Fix warning about ETIMEDOUT being redefined.
        -  Fix  warning about FSP_EXTENT_SIZE in xtradb  (32/64 bit right shift mismatch)
        -  Silence warnings coming from  generated  code (flex/bison) in xtradb/innodb_plugin.
        -  Be nice to people without cygwin (me) and add win/configure-mariadb.bat with options suitable for quick compilation, e.g no embedded
      56784da3
    • Michael Widenius's avatar
      Automatic merge with 5.1 · 754b085b
      Michael Widenius authored
      754b085b
    • Michael Widenius's avatar
      Fixed failures in buildbot · 24a2ebb4
      Michael Widenius authored
      mysql-test/suite/innodb_plugin/t/innodb_bug38231.test:
        Sometimes you get a timeout here; Disable the not fatal error message.
      storage/xtradb/sync/sync0rw.c:
        Disable compiler warning
      24a2ebb4
  11. 30 Nov, 2010 2 commits
    • unknown's avatar
      Bug#54201: "SET INSERT_ID" event must be ignored if corresponding event is ignored · 3f8b7252
      unknown authored
      An INSERT query log event is preceeded by an INSERT_ID intvar event if the
      INSERT allocates a new auto_increment value. But if we ignore the INSERT
      due to --replicate-ignore-table or similar, then the INSERT_ID event is
      still executed, and the set value of INSERT_ID lingers around in the
      slave sql thread THD object indefinitely until the next INSERT that
      happens to need allocation of a new auto_increment value.
      
      Normally this does not cause problems as such following INSERT would
      normally come with its own INSERT_ID event. In this bug, the user had
      a trigger on the slave which was missing on the master, and this
      trigger had an INSERT which could be affected. In any case, it seems
      better to not leave a stray INSERT_ID hanging around in the sql thread
      THD indefinitely.
      
      Note that events can also be skipped from apply_event_and_update_pos();
      however it is not possible in that code to skip the INSERT without also
      skipping the INSERT_ID event.
      3f8b7252
    • Michael Widenius's avatar
      Automatic merge with 5.1-release · 3aa65595
      Michael Widenius authored
      3aa65595
  12. 29 Nov, 2010 4 commits
    • Michael Widenius's avatar
      Fixed some compiler warnings · 8513393b
      Michael Widenius authored
      configure.in:
        Added comment
      mysql-test/suite/innodb_plugin/t/innodb_bug56680.test:
        Disable test when run with valgrind as we get errors from buf_buddy_relocate() on work for this test.
        (Should probably be investigated as this may be an issue in xtradb, but probably harmless)
        Work is an amd-64 running openSUSE 1.11 and valgrind 3.4.1
      mysys/charset.c:
        Remove static function if not used (to remove compiler warning)
      storage/xtradb/srv/srv0srv.c:
        Added casts to get rid of compiler warnings
      8513393b
    • Hakan Kuecuekyilmaz's avatar
    • Michael Widenius's avatar
      Automatic merge with 5.1-release · 96c0b965
      Michael Widenius authored
      96c0b965
    • Michael Widenius's avatar
      Fixed compiler and gmake warnings · 8379999e
      Michael Widenius authored
      - Removed SCCS rule from Makefile.am
      - Made dummy rule in sql_yacc.yy to get rid of compiler warning about not used label.
      Don't use maintainer mode with valgrind (as we don't want to initialize all variables)
      
      config/ac-macros/maintainer.m4:
        Don't use maintainer mode with valgrind (as we don't want to initialize all variables)
        Force initialization of variables when using -Werror (To get rid of compiler warnings)
      configure.in:
        Don't use maintainer mode with valgrind (as we don't want to initialize all variables)
      sql/sql_yacc.yy:
        Made dummy rule in sql_yacc.yy to get rid of compiler warning about not used label.
      8379999e
  13. 26 Nov, 2010 2 commits
    • Michael Widenius's avatar
      Fixed compiler warnings and a compilation failure on windows · 39d56986
      Michael Widenius authored
      extra/libevent/event.c:
        Tried to fix compiler warning on windows
      extra/libevent/evutil.h:
        Define __attribute__ for not gcc compilers
      extra/libevent/kqueue.c:
        Fixed compiler warnings
      extra/libevent/signal.c:
        Tried to fix compiler warning on windows
      storage/pbxt/src/ha_pbxt.cc:
        Fixed compiler warning about "variable might be clobbered by longjmp"
      storage/pbxt/src/table_xt.cc:
        Fixed compiler warnings (on windows)
      storage/xtradb/handler/i_s.cc:
        Fixed compiler warning by invoking the correct store function.
      39d56986
    • Michael Widenius's avatar
      Patch from Sergey Petrunya: · e0b7ad93
      Michael Widenius authored
      Fix post-merge failure in 5.1-merge 
      - Let QUICK_RANGE_INTERSECT_SELECT not make assumption that HA_EXTRA_KEYREAD 
        scans do not touch parts of table->record[0] that refer to fields that are 
        not covered by the used index.
        This assumption is not true for XtraDB (e.g. grep row/row0sel.c for 
        "init null bytes with default values as they might be").
      e0b7ad93
  14. 25 Nov, 2010 2 commits
    • Michael Widenius's avatar
      Automatic merge with 5.1 · 99b3beae
      Michael Widenius authored
      99b3beae
    • Michael Widenius's avatar
      Fixed failing test cases · d1b731d0
      Michael Widenius authored
      mysql-test/include/have_not_innodb_plugin.inc:
        Also detect if xtradb is installed
      mysql-test/suite/innodb/t/innodb_bug56143.test:
        Disabled test case that doesn't work for innodb_plugin/xtradb.
      mysql-test/suite/innodb_plugin/r/innodb_bug56632.result:
        Updated result (key_block_size is lower case in MariaDB, as all other options)
      mysql-test/suite/pbxt/r/partition_hash.result:
        Updated results (after partition row count optimization changes)
      mysql-test/suite/pbxt/r/partition_pruning.result:
        Updated results (after partition row count optimization changes)
      mysql-test/suite/pbxt/r/partition_range.result:
        Updated results (after partition row count optimization changes)
      mysql-test/suite/pbxt/r/subselect.result:
        Updated result after ROW() changes.
      d1b731d0