1. 06 Dec, 2010 1 commit
    • Michael Widenius's avatar
      Merge with 5.1-release. · 4d8061cb
      Michael Widenius authored
      - Fixed problem with oqgraph and 'make dist'
      
      Note that after this merge we have a problem show in join_outer where we examine too many rows in one specific case (related to BUG#57024).
      This will be fixed when mwl#128 is merged into 5.3.
      4d8061cb
  2. 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
  3. 04 Dec, 2010 10 commits
  4. 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
  5. 02 Dec, 2010 4 commits
  6. 01 Dec, 2010 6 commits
  7. 30 Nov, 2010 3 commits
    • Michael Widenius's avatar
      merge with 5.1 · e8608d8a
      Michael Widenius authored
      e8608d8a
    • 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
  8. 29 Nov, 2010 8 commits
    • Michael Widenius's avatar
      Fixed some compiler warnings found when compiling for windows. · d7f1b1c7
      Michael Widenius authored
      Changed rows_read and rows_sent status variables to be longlong (to avoid compiler warnings)
      
      
      sql/item_func.cc:
        Fixed wrong usage of alias
      sql/item_subselect.cc:
        Changed buffer size to ulonglong to be able detect buffers bigger than size_t
      sql/item_subselect.h:
        Changed buffer size to ulonglong to be able detect buffers bigger than size_t
      sql/multi_range_read.cc:
        Fixed compiler warning by using correct type for function argument
      sql/mysqld.cc:
        Changed rows_read and rows_sent status variables to be longlong
      sql/opt_subselect.h:
        Fixed compiler warning by using correct type for function argument
      sql/sql_class.cc:
        Changed rows_read and rows_sent status variables to be longlong
      sql/sql_class.h:
        Changed rows_read and rows_sent status variables to be longlong
        Changed max_nulls_in_row to uint as this is number of columns in row.
        This fixed some compiler warnings.
      sql/sql_select.cc:
        Added casts to avoid compiler warnings
      storage/heap/ha_heap.cc:
        Initilize different types separate
      storage/oqgraph/ha_oqgraph.cc:
        Fixed argument to store(longlong) to avoid compiler warnings
      d7f1b1c7
    • 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
    • Hakan Kuecuekyilmaz's avatar
    • unknown's avatar
    • unknown's avatar
      Auto-merge fix for LP BUG#611622 · bddd227d
      unknown authored
      bddd227d
    • 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
  9. 28 Nov, 2010 2 commits
  10. 27 Nov, 2010 2 commits
    • Michael Widenius's avatar
      Added TRASH() to table->record[0] to find out if we access not initialzed data. · a5cf2030
      Michael Widenius authored
      - Changed Cached_item_field not copy data for fields with NULL value
      - In key_copy() and key_restore() don't copy data for fields with NULL value
      
      Fixed code to avoid valgrind warnings
      - Use c_ptr_safe instead of c_ptr()
      
      Removed "QQ" from comments (QQ was ment to be used for internal comments that should be removed before pushing)
      Fixed wrong alias used (from previous patch)
      
      
      sql/event_db_repository.cc:
        Update testing if event table is valid (to avoid valgrind errors)
      sql/ha_partition.cc:
        m_ordered_scan_ongoing was not initialized
        Reset null bits in record to avoid valgrind errors
      sql/handler.h:
        Added flag if storage engine will write row verbatim and the row contains varchar or null fields
        (in which case we must clear the row to avoid valgrind warnings)
      sql/item_buff.cc:
        Changed Cached_item_field not copy data for fields with NULL value
        (Optimization and avoids valgrind warnings)
      sql/item_func.cc:
        c_ptr() -> c_ptr_safe()
      sql/key.cc:
        In key_copy() and key_restore() don't copy data for fields with NULL value
      sql/opt_range.cc:
        c_ptr() -> c_ptr_safe()
      sql/sql_base.cc:
        Added TRASH() to table->record[0] to find out if we access not initialzed data.
        Initialize null_bytes to:
        - Get consistent tests
        - Ensure we don't get valgrind warnings for null fields (as we may only update a couple of bits in a byte)
      sql/sql_class.cc:
        Removed "QQ" from comments
      sql/sql_insert.cc:
        Initialize row to default values if we are using valgrind and row will be copied verbatim to disk in storage engine.
      sql/sql_load.cc:
        QQ -> TODO
      sql/sql_parse.cc:
        Removed old not used code marked QQ and withing "#ifdef REMOVED"
      sql/sql_select.cc:
        QQ -> TODO
        Initialize some variables that was used uninitialized
        Added DBUG_ASSERT() to find out if thd was not properly initialized for sub queries
      sql/sql_test.cc:
        Fixed format for printing to DBUG file
        Fixed wrong alias used (from previous patch)
      sql/sql_trigger.h:
        QQ -> TODO
      sql/table.cc:
        QQ -> TODO
      storage/maria/ha_maria.cc:
        Mark table with HA_RECORD_MUST_BE_CLEAN_ON_WRITE, if row is written verbatim to disk and contains varchar or null fields.
      storage/maria/ma_open.c:
        Added flags if table has varchar or null fields
      storage/maria/maria_def.h:
        Added flags if table has varchar or null fields
      storage/myisam/ha_myisam.cc:
        Mark table with HA_RECORD_MUST_BE_CLEAN_ON_WRITE, if row is written verbatim to disk and contains varchar or null fields.
      storage/myisam/mi_open.c:
        Fixed memory overrun bug when using fulltext keys
      storage/xtradb/row/row0sel.c:
        Removed initialization of null bits. (not needed anymore)
      a5cf2030
    • Michael Widenius's avatar