1. 06 Dec, 2010 1 commit
    • Vladislav Vaintroub's avatar
      Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 · 0eae06c4
      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.
      0eae06c4
  2. 02 Dec, 2010 2 commits
  3. 01 Dec, 2010 2 commits
    • Vladislav Vaintroub's avatar
      Adapt fix_vs_config_dir () for VS2010 · 2f7a1564
      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.
      2f7a1564
    • Vladislav Vaintroub's avatar
      Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warnings · c87923dc
      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
      c87923dc
  4. 30 Nov, 2010 1 commit
  5. 29 Nov, 2010 4 commits
    • Michael Widenius's avatar
      Fixed some compiler warnings · d54f869f
      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
      d54f869f
    • Hakan Kuecuekyilmaz's avatar
    • Michael Widenius's avatar
      Automatic merge with 5.1-release · fde525de
      Michael Widenius authored
      fde525de
    • Michael Widenius's avatar
      Fixed compiler and gmake warnings · e68ff466
      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.
      e68ff466
  6. 26 Nov, 2010 2 commits
    • Michael Widenius's avatar
      Fixed compiler warnings and a compilation failure on windows · 9ab4829b
      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.
      9ab4829b
    • Michael Widenius's avatar
      Patch from Sergey Petrunya: · b8b3716a
      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").
      b8b3716a
  7. 25 Nov, 2010 5 commits
    • Michael Widenius's avatar
      Automatic merge with 5.1 · 171260f3
      Michael Widenius authored
      171260f3
    • Michael Widenius's avatar
      Fixed failing test cases · 40b7efb3
      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.
      40b7efb3
    • Michael Widenius's avatar
      Merge of innodb_plugin for MySQL 5.1.53 with xtradb · f900b658
      Michael Widenius authored
      Fixed compiler warnings in xtradb
      Added back resetting of null bitmap but now in row_search_for_mysql()
      
      storage/xtradb/row/row0sel.c:
        Added back resetting of null bitmap but now in row_search_for_mysql()
      f900b658
    • Michael Widenius's avatar
      A proper fix for bug #57688. · 721a6a6a
      Michael Widenius authored
      Introduced a new flag in the class Item. The flag is set
      to 1 only for items that are used in GROUP BY lists of
      queries with ROLLUP.
      721a6a6a
    • Michael Widenius's avatar
      Automatic merge with base · babdbbbf
      Michael Widenius authored
      babdbbbf
  8. 24 Nov, 2010 4 commits
  9. 23 Nov, 2010 4 commits
  10. 18 Nov, 2010 1 commit
  11. 17 Nov, 2010 1 commit
    • unknown's avatar
      MWL#74: Shared libmysqld.so library. · 0de9a4ab
      unknown authored
      Switch makefiles to use libtool to build libmysqld.so, as well as all its
      dependencies.
      
      The previous MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS() declaration is removed,
      as it does not work well with a libtool build. Instead, plugins that need it
      can specify an alternate object in MYSQL_PLUGIN_STATIC() that will be used for
      embedded library. The plugin must then take care itself of compiling the
      special object for embedded, rebuilding the source files previously listed in
      MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS() with @plugin_embedded_defs@ in
      CFLAGS/CXXFLAGS. The extra target @XXX_embedded_static_target@ is available
      for the special object, this will be empty when --without-embedded-server.
      
      All in-tree plugins are changed to build their static targets with libtool.
      Additional plugins that want to work with libmysqld.so will need to be
      similarly modified to build with libtool (or otherwise provide an -fPIC
      object). Dynamically loaded plugins are not affected.
      
      The old libraries like libmysys.a, libmyisam.a and similar libraries, which
      were installed by `make install` though this is of little use, are still built
      and installed to not break package scripts etc. that expect them. These
      libraries are kept static to avoid introducing new .so dependencies.
      
      The patch also fixes a handfull of duplicate symbol linker errors, where we
      included some object twice during linking; these for one reason or another did
      not produce errors before but caused problems on some platforms with this
      patch (eg. Mac OS X linker is more strict for shared objects).
      
      This patch only does what is necessary to build libmysqld.so. There are some
      more cleanups that are possible now that we are using libtool more fully,
      which could done in subsequent patches (though we may not bother as we are
      switching from autotools to CMake anyway):
      
       - In libmysql_r/, we should be able to just link libmysys.la etc, instead of
         symlinking and re-compiling sources into the directory.
      
       - In libmysql/, we can similarly avoid symlinking and recompiling sources if
         we instead build a libmysys_nothread.la library with appropriate CFLAGS and
         link that.
      
       - In sql/, we can build a separate target libmysql_int.la with appropriate
         CFLAGS for embedded and use that in libmysqld/ instead of symlinking
         sources.
      
       - libmysys.a, libmyisam.a and similar libraries could be installed as .so
         also to save on code size; or alternatively could be not installed at all.
      
      
      client/Makefile.am:
        Updated for using libtool
      config/ac-macros/plugins.m4:
        Replace MUSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS with mechanism for plugins
        to specify alternate object for embedded.
      configure.in:
        Fix linking duplicate objects related to THREAD_LOBJECTS.
      dbug/Makefile.am:
        Updated for using libtool
      extra/Makefile.am:
        Fix relative paths.
      libmysqld/Makefile.am:
        Build libmysqld.la using libtool
      libmysqld/examples/Makefile.am:
        Updated to use libtool
      mysys/Makefile.am:
        Updated to use libtool.
        Fix linking duplicate objects related to THREAD_LOBJECTS.
      mysys/my_uuid.c:
        Fix conflicting global mutex name by making it static.
      regex/Makefile.am:
        Updated to use libtool
      sql/Makefile.am:
        Updated to use libtool
      sql/item_func.cc:
        Fix conflicting mutex name.
      sql/mysql_priv.h:
        Fix conflicting mutex name
      sql/mysqld.cc:
        Fix conflicting mutex name.
        Add missing call of my_uuid_end().
      storage/archive/Makefile.am:
        Updated to use libtool
      storage/archive/plug.in:
        Updated to use libtool
      storage/blackhole/Makefile.am:
        Updated to use libtool
      storage/blackhole/plug.in:
        Updated to use libtool
      storage/csv/Makefile.am:
        Updated to use libtool
      storage/csv/plug.in:
        Updated to use libtool
      storage/example/Makefile.am:
        Updated to use libtool
      storage/federated/Makefile.am:
        Updated to use libtool
      storage/federated/plug.in:
        Updated to use libtool
      storage/federatedx/Makefile.am:
        Updated to use libtool
      storage/federatedx/plug.in:
        Updated to use libtool
      storage/heap/Makefile.am:
        Updated to use libtool
      storage/heap/plug.in:
        Updated to use libtool
      storage/innobase/Makefile.am:
        Updated to use libtool
      storage/innobase/plug.in.disabled:
        Updated to use libtool
      storage/innodb_plugin/Makefile.am:
        Updated to use libtool
      storage/maria/CMakeLists.txt:
        Fix linking duplicate object in maria_dump_log, causes failure on Mac OS X
      storage/maria/Makefile.am:
        Updated to use libtool
        Fix linking duplicate object in maria_dump_log, causes link failure on Mac OS X
      storage/maria/ma_loghandler.c:
        Move maria_dump_log code to separate file to fix duplicate object link failures.
      storage/maria/ma_loghandler.h:
        Move maria_dump_log code to separate file to fix duplicate object link failures.
      storage/maria/maria_dump_log.c:
        Move maria_dump_log code to separate file to fix duplicate object link failures.
      storage/maria/plug.in:
        Updated to use libtool
      storage/myisam/Makefile.am:
        Updated to use libtool
      storage/myisam/plug.in:
        Updated to use libtool
      storage/myisammrg/Makefile.am:
        Updated to use libtool
      storage/myisammrg/plug.in:
        Updated to use libtool
      storage/pbxt/plug.in:
        Updated to use libtool
      storage/pbxt/src/Makefile.am:
        Updated to use libtool
      storage/xtradb/Makefile.am:
        Updated to use libtool
      storage/xtradb/plug.in:
        Updated to use libtool
      strings/Makefile.am:
        Updated to use libtool
      unittest/unit.pl:
        Don't attempt to run libtool internal files as unit tests.
      vio/Makefile.am:
        Updated to use libtool
      0de9a4ab
  12. 09 Nov, 2010 1 commit
    • unknown's avatar
      MBug#643463: Slow XtraDB shutdown: Fix more sleeps delaying shutdown. · 7a28f61d
      unknown authored
      This patch removes most remaining delays due to uninteruptible sleep()
      during shutdown, as found using PMP. This makes standard test run very
      close in speed to with --loose-innodb-fast-shutdown=2, and greatly
      speeds up running the test suite.
      
      sql/mysqld.cc:
        Poll for threads to die every 20 msec during shutdown, rather than force
        a wait for 2 full seconds should one thread be a little slow to exit
        (this was seen occasionally in mysql-test-run).
      storage/xtradb/include/srv0srv.h:
        Rename the event, as we now use it to wakeup more threads during shutdown.
      storage/xtradb/log/log0log.c:
        Rename the event, as we now use it to wakeup more threads during shutdown.
      storage/xtradb/srv/srv0srv.c:
        Replace some hardcoded sleep()s with os_wait_event_time() that can be
        interrupted early during server shutdown to avoid unnecessary delays.
      7a28f61d
  13. 16 Nov, 2010 2 commits
  14. 15 Nov, 2010 1 commit
    • Michael Widenius's avatar
      Fixed bug discovered by testcase for LP#618558 (original bug seams to be fixed): · d95cbe36
      Michael Widenius authored
      - Fixed bug in pagecache_delete_internal() when deleting block that was flushed by another thread (fixed bug when block->next_used was unexpectedly null)
      Fixed some using uninitialized memory warnings found by valgrind. 
      
      mysql-test/t/information_schema_all_engines-master.opt:
        Added options to make slow test run faster
      sql/sp.cc:
        Fixed valgrind warning.
      sql/sql_show.cc:
        Fixed valgrind warning.
      storage/maria/ma_bitmap.c:
        Fixed wrong call parameter to pagecache_unlock_by_link() that caused assert crash in pagecache
      storage/maria/ma_pagecache.c:
        Fixed possible error in pagecache_wait_lock() when hash_link was not set. (We never hit this issue, but could be possible when two threads updates the same page.
        Fixed bug in pagecache_delete_internal() when deleting block that was flushed by another thread (fixed bug when block->next_used was unexpectedly null)
        Cleanup: moved pagecache_pthread_mutex_unlock() over comments and asserts to be just before pagecache_fwrite()
      d95cbe36
  15. 07 Nov, 2010 1 commit
    • Michael Widenius's avatar
      Added option BACKUP_ALL to mysqld --myisam-recover to also get a backup of the... · 9d68ccde
      Michael Widenius authored
      Added option BACKUP_ALL to mysqld --myisam-recover to also get a backup of the index file before it's repaired.
      Removed wrong call to translog_buffer_unlock() that caused 'unlocking not locked mutex' failure in Aria log handler.
      
      extra/replace.c:
        Updated call to my_redel()
      include/maria.h:
        Updated prototype for maria_change_to_newfile
      include/my_sys.h:
        Updated prototypes
        Added my_create_backup_name
      include/myisam.h:
        Updated prototypes
      include/myisamchk.h:
        Added 'backup_time' to st_handler_check_param to be able to generate same name for backuped data and index file
      mysys/my_redel.c:
        Added time_t option to my_redel() to be able to generate same backup extensions for many files
      sql/handler.cc:
        Added start_time to st_ha_check_opt
      sql/handler.h:
        Added start_time to HA_CHECK_OPT
      sql/mysqld.cc:
        Added option BACKUP_ALL to --myisam-recover
      storage/maria/ha_maria.cc:
        Remember start time for repair
      storage/maria/ma_check.c:
        Use remembered start time for backup file names
        Removed some dead code
      storage/maria/ma_loghandler.c:
        Removed wrong call to translog_buffer_unlock() that caused 'unlocking not locked mutex' failure in log handler.
      storage/maria/maria_chk.c:
        Removed dead code (O_NEW_INDEX was never set)
        Report if table was 'crashed on repair'
      storage/maria/maria_pack.c:
        Updated parameters to my_redel()
      storage/myisam/ha_myisam.cc:
        Added recover option BACKUP_ALL to get a backup of the index file before it's repaired.
        Print information to log if we make a backup of data as part of repair.
      storage/myisam/ha_myisam.h:
        Added HA_RECOVER_FULL_BACKUP
      storage/myisam/mi_check.c:
        Use remembered start time for backup file names
        Added mi_make_backup_of_index()
      storage/myisam/myisamchk.c:
        Removed dead code (O_NEW_INDEX was never set)
        Report if table was 'crashed on repair'
      storage/myisam/myisampack.c:
        Updated call to my_redel()
      9d68ccde
  16. 04 Nov, 2010 2 commits
    • Michael Widenius's avatar
      Automatic merge · a1bd9532
      Michael Widenius authored
      a1bd9532
    • Michael Widenius's avatar
      When scanning pages, stop when you are at 'data_file_length'. · e3c8798e
      Michael Widenius authored
      This fixes a bug that gave ER_FILE_TOO_SHORT error when scanning Aria tables.
      
      storage/maria/ma_blockrec.c:
        Changed code so that we update share->state.state.data_file_length after page cache write is done.
        When scanning pages, stop when you are at 'data_file_length'.
        (We can't trust the bitmap as there may be reserved pages in the bitmap that are not yet written).
        This fixes a bug that gave ER_FILE_TOO_SHORT error when scanning Aria tables.
      storage/maria/maria_def.h:
        Updated struct for stopping scanning at end of file
      e3c8798e
  17. 03 Nov, 2010 5 commits
    • unknown's avatar
      MBug#643463: slow XtraDB shutdown due to 10 second sleep in purge thread · e55c4836
      unknown authored
      Implement os_event_wait_time() for POSIX systems.
      
      In the purge thread, use os_event_wait_time() when sleeping rather than sleep,
      and signal the event when server shuts down, so we do not need to wait for
      upto 10 seconds until the purge thread wakes up.
      
      Also fix bug that warnings that were pushed after we call set_ok_status() were
      not included in the waning count sent to the client in the result packet.
      
      Also in mysqltest, in recursive die() invocation at least print the message
      before aborting.
      
      client/mysqltest.cc:
        If we detect recursive die(), at least print the message before aborting.
      mysql-test/r/warnings_debug.result:
        Test case.
      mysql-test/t/warnings_debug.test:
        Test case.
      sql/handler.cc:
        Force generation of a warning with specific debug option, for testing.
      sql/protocol.cc:
        Fix wrong DBUG_ENTER
      sql/sql_class.h:
        Add method to count warnings pushed after set_ok_status() is called.
      sql/sql_error.cc:
        Also count warnings pushed after set_ok_status() is called.
      storage/xtradb/include/os0sync.h:
        Implement working os_sync_wait_time() for POSIX.
      storage/xtradb/include/srv0srv.h:
        Make the purge thread wait for an event when sleeping, so we can signal it to
        wakeup immediately at shutdown.
      storage/xtradb/log/log0log.c:
        Make the purge thread wait for an event when sleeping, so we can signal it to
        wakeup immediately at shutdown.
      storage/xtradb/os/os0sync.c:
        Implement working os_sync_wait_time() for POSIX.
      storage/xtradb/srv/srv0srv.c:
        Make the purge thread wait for an event when sleeping, so we can signal it to
        wakeup immediately at shutdown.
      e55c4836
    • Michael Widenius's avatar
    • Michael Widenius's avatar
      Automatic merge · f8195628
      Michael Widenius authored
      f8195628
    • Michael Widenius's avatar
      Fixed compiler & valgrind warnings from my previous push. · 5b3159db
      Michael Widenius authored
      Fixed a bug in Aria when two threads was inserting into the same table and row page and one thread did an abort becasue of duplicate key.
      
      
      
      mysys/thr_lock.c:
        Fixed valgrind warning
      sql/sql_base.cc:
        Remove not used variable
      storage/maria/ma_bitmap.c:
        Added ma_bitmap_lock() & ma_bitmap_unlock() to protect against two threads using the bitmap at the same time.
        More DBUG_PRINT()
      storage/maria/ma_blockrec.c:
        Fixed a bug in Aria when two threads was inserting into the same table and row page and one thread did an abort becasue of duplicate key.
        Fix was that we block other threads to modify the bitmap while we are removing the row with a duplicate key.
      storage/maria/ma_blockrec.h:
        Added ma_bitmap_lock() & ma_bitmap_unlock() to protect against two threads using the bitmap at the same time.
      storage/maria/maria_def.h:
        Changed flush_all_requested to be a counter.
      storage/myisam/mi_locking.c:
        Fixed compiler error on windows (typo).
      5b3159db
    • Georgi Kodinov's avatar
      merge · 5e100a64
      Georgi Kodinov authored
      5e100a64
  18. 02 Nov, 2010 1 commit