1. 01 Apr, 2010 8 commits
    • unknown's avatar
      Fied problem with of compilation without dynamic plugin loading. · 6490b806
      unknown authored
      sql/sql_plugin.cc:
        Fixed #ifdef
      6490b806
    • unknown's avatar
      Maria WL#61 · 3558f1a3
      unknown authored
        
        Interface for maria extensions.
        Alternative plugin interface with additional info (maturity and string version).
      
      CMakeLists.txt:
        Maria plugin interface used.
      config/ac-macros/plugins.m4:
        Maria plugin interface used.
      configure.in:
        Maria plugin interface used.
      include/mysql/plugin.h:
        Maria plugin interface added.
      include/mysql/plugin_auth.h.pp:
        Maria plugin interface added.
      plugin/auth/auth_socket.c:
        Maria plugin interface added.
      plugin/auth/dialog.c:
        Maria plugin interface added.
      plugin/daemon_example/daemon_example.cc:
        Maria plugin interface added.
      plugin/fulltext/plugin_example.c:
        Maria plugin interface added.
      sql/ha_ndbcluster.cc:
        Maria plugin interface added.
      sql/ha_partition.cc:
        Maria plugin interface added.
      sql/log.cc:
        Maria plugin interface added.
      sql/sql_acl.cc:
        Maria plugin interface added.
      sql/sql_builtin.cc.in:
        Maria plugin interface used.
      sql/sql_plugin.cc:
        Maria plugin interface added.
      sql/sql_plugin.h:
        Maria plugin interface used.
      sql/sql_show.cc:
        Maria plugin interface added.
      storage/archive/ha_archive.cc:
        Maria plugin interface added.
      storage/blackhole/ha_blackhole.cc:
        Maria plugin interface added.
      storage/csv/ha_tina.cc:
        Maria plugin interface added.
      storage/example/ha_example.cc:
        Maria plugin interface added.
      storage/federated/ha_federated.cc:
        Maria plugin interface added.
      storage/federatedx/ha_federatedx.cc:
        Maria plugin interface added.
      storage/heap/ha_heap.cc:
        Maria plugin interface added.
      storage/ibmdb2i/ha_ibmdb2i.cc:
        Maria plugin interface added.
      storage/innobase/handler/ha_innodb.cc:
        Maria plugin interface added.
      storage/innodb_plugin/handler/i_s.cc:
        Maria plugin interface added.
      storage/maria/ha_maria.cc:
        Maria plugin interface added.
      storage/myisam/ha_myisam.cc:
        Maria plugin interface added.
      storage/myisammrg/ha_myisammrg.cc:
        Maria plugin interface added.
      storage/pbxt/src/ha_pbxt.cc:
        Maria plugin interface added.
      storage/xtradb/handler/ha_innodb.cc:
        Maria plugin interface added.
      storage/xtradb/handler/i_s.cc:
        Maria plugin interface added.
      storage/xtradb/handler/i_s.h:
        Maria plugin interface added.
      3558f1a3
    • Michael Widenius's avatar
      Auto merge with 5.1 · 2f6a1db8
      Michael Widenius authored
      2f6a1db8
    • Michael Widenius's avatar
      Fixed wrong regexps · ae136cce
      Michael Widenius authored
      ae136cce
    • Michael Widenius's avatar
      Auto merge with 5.1 · 851b86de
      Michael Widenius authored
      851b86de
    • Michael Widenius's avatar
      Auto merge with 5.1 · c13dd8fb
      Michael Widenius authored
      c13dd8fb
    • Michael Widenius's avatar
    • Michael Widenius's avatar
      Merge with 5.1 · 9ea34379
      Michael Widenius authored
      Fixed valgrind warnings found from running main.connect under valgrind
      
      
      sql/sp_head.cc:
        Ensure that vcol_info is reset
      sql/sql_acl.cc:
        Fixed usage of wrong memroot for password
      sql/sql_yacc.yy:
        Ensure that vcol_info is reset
      9ea34379
  2. 31 Mar, 2010 3 commits
    • Michael Widenius's avatar
      Added missing space from last push · 197c7c01
      Michael Widenius authored
      Fixed compiler warnings
      
      mysys/my_gethostbyname.c:
        Added missing space from last push
      storage/xtradb/handler/i_s.cc:
        Removed not used variable
      storage/xtradb/log/log0recv.c:
        Removed not used variable
      197c7c01
    • Michael Widenius's avatar
      Fixed compiler warnings · 69203a6b
      Michael Widenius authored
      Fixed random failure in test system
      
      BUILD/compile-solaris-sparc:
        Addex EXTRA_FLAGS to configure line (to get rid of warnings for not initialzed variables on buildbot)
      cmd-line-utils/libedit/filecomplete.c:
        Remove not used variables
      mysql-test/suite/rpl/r/rpl_optimize.result:
        Updated result
      mysql-test/suite/rpl/t/rpl_optimize.test:
        Use sync_salve_with_master to ensure cleanup on slave
      support-files/compiler_warnings.supp:
        Added suppression of libedit files
      69203a6b
    • Michael Widenius's avatar
      Fixed some compiler warnings · 82966f2e
      Michael Widenius authored
      include/m_ctype.h:
        MY_UNICASE_INFO already includes 'const'
      plugin/auth/dialog.c:
        Fixed parameters to have correct signed/unsigned type
      sql/sql_acl.cc:
        old_password_plugin is not used for EMBEDDED_LIBRARY
      storage/pbxt/src/ha_pbxt.cc:
        Remove not used variable
      82966f2e
  3. 30 Mar, 2010 3 commits
    • Michael Widenius's avatar
      Removed compiler warning · d5d4905f
      Michael Widenius authored
      Disable pbxt for test cases not using pbxt (speeds up test suite)
      
      extra/comp_err.c:
        Added cast to get rid of compiler warning
      extra/libevent/kqueue.c:
        Added cast to get rid of compiler warning
      mysql-test/lib/mtr_cases.pm:
        Use --skip-pbxt for test cases that doesn't need pbxt
        Collect default-storage-engine from suite.opt file (should actually be my.cnf file, but that wasn't easy to do)
      mysql-test/suite/pbxt/t/suite.opt:
        Added marker for mysql-test-run.pl that this suite require pbxt
      mysys/mf_keycache.c:
        Use LINT_INIT() to remove compiler warnings
      mysys/my_gethostbyname.c:
        Remove compiler warnings
      sql/handler.cc:
        Reset variable that may be used uninitialized
      sql/item.h:
        Remove compiler warning
      sql/mysqld.cc:
        Use LINT_INIT() to remove compiler warnings
      sql/sql_class.h:
        Remove compiler warning
      sql/sql_table.cc:
        Ensure variable is always set (to remove compiler warning)
      sql/sql_view.cc:
        Use LINT_INIT() to remove compiler warnings
      storage/maria/ma_loghandler.c:
        Use LINT_INIT() to remove compiler warnings
      storage/myisammrg/ha_myisammrg.cc:
        Fixed wrong type to printf
      storage/myisammrg/myrg_open.c:
        Use LINT_INIT() to remove compiler warnings
      storage/xtradb/include/ut0lst.h:
        Trivial change of macro to remove compiler warning
      strings/ctype-ucs2.c:
        Use LINT_INIT() to remove compiler warnings
      strings/ctype-utf8.c:
        Use LINT_INIT() to remove compiler warnings
      support-files/compiler_warnings.supp:
        Suppress some not relevant warnings
      unittest/mysys/waiting_threads-t.c:
        Don't use ftruncate() as this gives warning about ignored return value
      d5d4905f
    • unknown's avatar
      Compiler warnings removed. · 5c43b72a
      unknown authored
      storage/maria/ma_loghandler.c:
        compiler warnings removed.
      5c43b72a
    • unknown's avatar
      Remove compiler warning · dd9e90d2
      unknown authored
      storage/maria/ma_loghandler.c:
        Remove compiler warning.
      dd9e90d2
  4. 29 Mar, 2010 4 commits
    • Michael Widenius's avatar
      Fixed random failure in test system · 3517ce24
      Michael Widenius authored
      Removed and suppressed compiler warnings
      
      
      mysql-test/suite/parts/t/rpl_partition.test:
        Mark as big test (as test takes > 5 minutes)
      mysql-test/suite/rpl/t/rpl_row_trig003.test:
        Fixed random failure
      sql/item_create.cc:
        Renamed create -> create_builder() to avoid compiler warnings about function hidden by others
      sql/net_serv.cc:
        Removed compiler warning
      support-files/compiler_warnings.supp:
        Supress some warnings
        Remove suppresstion from set_var.cc, as this has already been fixed
        Added missing \ before .c
        Added suppression of warnings that are due to gcc bug (.*discards qualifiers from pointer target type.*)
      3517ce24
    • unknown's avatar
      4d99ecbc
    • Sergei Golubchik's avatar
      tell autoconf about --with-plugin options to avoid · 8e8eec3e
      Sergei Golubchik authored
      configure: WARNING: unrecognized options: --without-plugin-xxx
      8e8eec3e
    • Sergei Golubchik's avatar
      pluggable auth with plugin examples · f6ba3a74
      Sergei Golubchik authored
      Makefile.am:
        add new API files to the check_abi rule,
        remove duplicates
      client/CMakeLists.txt:
        now a client can use dlopen too
      client/Makefile.am:
        be csh-friendly
      include/my_global.h:
        add dummy plugs for dlopen and co.
        for the code that needs them to work in static builds
      mysys/Makefile.am:
        be csh-friendly
      plugin/auth/dialog.c:
        typo fixed
      f6ba3a74
  5. 28 Mar, 2010 1 commit
    • Michael Widenius's avatar
      Fixed compiler warnings and sporadic failures in test cases · 691b295a
      Michael Widenius authored
      
      mysql-test/extra/rpl_tests/rpl_tmp_table_and_DDL.test:
        Added missing sync_slave_with_master; Fixes random failures
      mysql-test/include/default_mysqld.cnf:
        default-character-set -> character-set-server (removes warning in error files for usage of deprecated options)
      mysql-test/lib/My/SafeProcess/safe_process.cc:
        Fixed compiler warning
      mysql-test/lib/v1/mysql-test-run.pl:
        default-character-set -> character-set-server (removes warning in error files for usage of deprecated options)
      mysql-test/suite/rpl/r/rpl_do_grant.result:
        Updated test results
      mysql-test/suite/rpl/t/rpl_do_grant.test:
        Added missing sync_slave_with_master; Fixes random failures
        Had to explictely do stop slave before DROP USER to avoid failure on slave as the user is already dropped on slave.
      mysql-test/suite/rpl/t/rpl_name_const.test:
        Added missing sync_slave_with_master; Fixes random failures
      mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test:
        Added missing sync_slave_with_master; Fixes random failures
      mysql-test/t/bug47671-master.opt:
        default-character-set -> character-set-server (removes warning in error files for usage of deprecated options)
      mysql-test/t/ctype_latin1_de-master.opt:
        default-character-set -> character-set-server (removes warning in error files for usage of deprecated options)
      mysql-test/t/ctype_ucs2_def-master.opt:
        default-character-set -> character-set-server (removes warning in error files for usage of deprecated options)
      sql-common/client.c:
        Fixed compiler warning
      sql/item.cc:
        Renamed function to remove compiler warnings (with gcc)
      sql/item.h:
        Renamed function to remove compiler warnings (with gcc)
      sql/item_cmpfunc.cc:
        Renamed function to remove compiler warnings (with gcc)
      sql/item_create.cc:
        Renamed function to remove compiler warnings (with gcc)
      sql/item_create.h:
        Renamed function to remove compiler warnings (with gcc)
      sql/item_sum.cc:
        Renamed function to remove compiler warnings (with gcc)
      sql/item_sum.h:
        Renamed function to remove compiler warnings (with gcc)
      sql/set_var.cc:
        Don't use bit_do_set() / bot_is_set() / bit_do_clear() as this generates compiler warnings
        (They are also of no use as we know the value can hold the bits)
      sql/sql_yacc.yy:
        Renamed function to remove compiler warnings (with gcc)
      storage/example/ha_example.h:
        Fixed old read_time() prototype
      storage/maria/ma_search.c:
        Added extra variables to remove compiler warnings
      storage/maria/maria_def.h:
        Added extra variables to remove compiler warnings
      storage/myisam/ft_stopwords.c:
        Added cast to get rid of compiler warning
      storage/xtradb/fil/fil0fil.c:
        Added cast to get rid of compiler warning
      storage/xtradb/include/page0page.h:
        Added const to get rid of compiler warning
      storage/xtradb/include/page0page.ic:
        Added const to get rid of compiler warning
      support-files/compiler_warnings.supp:
        Added suppression of strict-aliasing
      691b295a
  6. 24 Mar, 2010 1 commit
  7. 12 Mar, 2010 2 commits
  8. 10 Mar, 2010 6 commits
    • Michael Widenius's avatar
      Fix for Bug #534626 MyISAM table created in MariaDB not readable by MySQL · 6f6e94db
      Michael Widenius authored
      storage/myisam/mi_create.c:
        Don't set HA_OPTION_NULL_FIELDS if table is not using CHECKSUM as this makes the table incompatible with MySQL.
      6f6e94db
    • Michael Widenius's avatar
      Automatic merge · 2f543bbc
      Michael Widenius authored
      2f543bbc
    • Michael Widenius's avatar
      Fix for: Bug#44987 DELETE IGNORE and FK constraint · 85702855
      Michael Widenius authored
      - Now DELETE IGNORE skips over rows with a foreign key constraints (as it was supposed to do)
      
      
      mysql-test/r/foreign_key.result:
        Test case for Bug#44987 DELETE IGNORE and FK constraint
      mysql-test/t/foreign_key.test:
        Test case for Bug#44987 DELETE IGNORE and FK constraint
      sql/sql_delete.cc:
        Firx for Bug#44987 DELETE IGNORE and FK constraint
        Now DELETE IGNORE skips over rows with a foreign key constraints (as it was supposed to do)
        Bug fix inspired by: Moritz Mertinkat
      85702855
    • unknown's avatar
      Fix some compiler warnings seen in Buildbot. · afc4c8c4
      unknown authored
      Add some extra error output and code cleanup in an attempt to fix/debug
      a rare random testsuite problem in check_warnings, where the exit code
      from mysqltest is somehow corrupted inside mysql-test-run.pl.
      
      include/my_global.h:
        Fix compiler warnings on some platforms.
      mysql-test/lib/My/SafeProcess.pm:
        Move dereference of $? subprocess exit code closer to where it is generated,
        to make the code more robust and on the chance that this will fix the
        occasional problems in check_warnings we see in Buildbot.
      mysql-test/mysql-test-run.pl:
        When check_warnings failed, also log the mysqld server for which it failed.
      sql/sql_lex.cc:
        Fix compiler warning about possibly uninitialised value, by rewriting a for()
        loop that is always executed at least once into a do .. while() loop with an
        assert.
      sql/table.cc:
        Fix compiler warning about uninitialised value.
      storage/federatedx/ha_federatedx.cc:
        Fix uninitialised variable.
      storage/maria/ma_delete.c:
        Fix compiler warning about uninitialised value.
      storage/maria/ma_loghandler.c:
        Fix compiler warning about uninitialised value.
      storage/myisam/ft_stopwords.c:
        Fix compiler warning.
      storage/myisam/mi_write.c:
        Fix compiler warning about possibly uninitialised value, by rewriting a while()
        loop that is always executed at least once into a do .. while() loop with an
        assert.
      storage/xtradb/btr/btr0cur.c:
        Fix compiler warning about possibly uninitialised value.
      support-files/compiler_warnings.supp:
        Fix warning suppression to cover all cases in yassl.
      vio/viossl.c:
        Fix compiler warning.
      afc4c8c4
    • unknown's avatar
      5ede158e
    • unknown's avatar
      Fixes for two test failures in Buildbot. · 768e96a8
      unknown authored
       - Adjust timing in test case, to avoid test failures caused by high load
         on machines and consequent race conditions in the test case.
      
       - Add another variant of Valgrind suppressions for memory leak in system
         libraries when unloading dynamic object files.
      
      
      mysql-test/r/information_schema.result:
        Adjust timing to avoid test failures due to races.
      mysql-test/t/information_schema.test:
        Adjust timing to avoid test failures due to races.
      mysql-test/valgrind.supp:
        Add another variant of valgrind suppression for leak in system libs.
      768e96a8
  9. 09 Mar, 2010 4 commits
    • unknown's avatar
      Fix a buildbot memory leak due to JOIN::destroy() not being called for EXPLAIN · cceade1c
      unknown authored
      query:
      - When subquery is located in ORDER BY, EXPLAIN will run as follows:
        select_describe() will run JOIN::prepare()/optimize() for the subquery;
        then at some point subselect_single_select_engine::prepare() will be called,
        which will create another join and run join->prepare().
      
        In mainline mysql this is not a problem because subquery's join will be 
        destroyed after the first call. 
        In MariaDB, it won't (table elimination needs to keep JOIN objects around
        for longer in order to know which tables were eliminated when constructing
        EXPLAIN EXTENDED warning).
      
        Fix the problem of memory leak by calling select_lex->cleanup() in 
        subselect_single_select_engine::prepare().
      cceade1c
    • unknown's avatar
      Automerge MySQL 5.1.44 merge into MariaDB trunk. · 52679413
      unknown authored
      52679413
    • Michael Widenius's avatar
      Added count of my_sync calls (to SHOW STATUS) · 4ca2c06d
      Michael Widenius authored
      tmp_table_size can now be set to 0 (to disable in memory internal temp tables)
      Improved speed for internal Maria temp tables:
      - Don't use packed keys, except with long text fields.
      - Don't copy key all accessed pages during key search.
      Some new benchmark tests to sql-bench (for group by)
      
      BUILD/compile-pentium64-gcov:
        Update script to use same pentium_config flags as other tests
      BUILD/compile-pentium64-gprof:
        Update script to use same pentium_config flags as other tests
      include/my_sys.h:
        Added count of my_sync calls
      mysql-test/r/variables.result:
        tmp_table_size can now be set to 0
      sql-bench/test-select.sh:
        Added some new test for GROUP BY on a not key field and group by with different order by
      sql/mysqld.cc:
        Added count of my_sync calls
        tmp_table_size can now be set to 0 (to disable in memory internal temp tables)
      sql/sql_select.cc:
        If tmp_table_size is 0, don't use in memory temp tables (good for benchmarking MyISAM/Maria temp tables)
        Don't pack keys for Maria tables;  The 8K page size makes packed keys too slow for temp tables.
      storage/maria/ma_key_recover.h:
        Moved definition to maria_def.h
      storage/maria/ma_page.c:
        Moved code used to simplify comparing of identical Maria tables to own function (page_cleanup())
        Fixed that one can read a page with a read lock.
      storage/maria/ma_rkey.c:
        For not exact key reads, cache the page where we found key (to speed up future read-next/read-prev calls)
      storage/maria/ma_search.c:
        Moved code to cache last key page to separate function.
        Instead of copying pages, only get a link to the page. This notable speeds up key searches on bigger tables.
      storage/maria/ma_write.c:
        Added comment
      storage/maria/maria_def.h:
        Moved page_cleanup() to separate function.
      4ca2c06d
    • unknown's avatar
      A number of after-merge fixes following merge of MySQL 5.1.44 into MariaDB. · 848df231
      unknown authored
      Bug#46949: memory leak with failed alter table to create partitions based on extract()
      
      Bug#51830: Incorrect partition pruning on range partition (regression)
      
      Fixed valgrind failure in select_describe(), read of uninitialized 
        Item_subselect::eliminated.
      
      PBXT test file updates to reflect changes done in MySQL.
      
      mysql-test/suite/pbxt/r/partition_error.result:
        Result file update following MySQL 5.1.44 changes.
      mysql-test/suite/pbxt/r/partition_pruning.result:
        Result file update following MySQL 5.1.44 changes.
      mysql-test/suite/pbxt/t/partition_error.test:
        Test file update following MySQL 5.1.44 changes.
      sql/item_subselect.cc:
          Fixed valgrind failure in select_describe(), read of uninitialized 
          Item_subselect::eliminated: 
          - it turns out we can call select_describe() without having fixed 
            subquery items for child subselects. These are not the kind of subqueries
            that we could eliminate, so the fix is to ensure that 
            item_subselect->eliminated==FALSE even before fix_fields is called.
            Also added code to reset item_subselect->eliminated back to FALSE in
            Item::reset() call.
      sql/item_subselect.h:
          Fixed valgrind failure in select_describe(), read of uninitialized 
          Item_subselect::eliminated: 
          - it turns out we can call select_describe() without having fixed 
            subquery items for child subselects. These are not the kind of subqueries
            that we could eliminate, so the fix is to ensure that 
            item_subselect->eliminated==FALSE even before fix_fields is called.
            Also added code to reset item_subselect->eliminated back to FALSE in
            Item::reset() call.
      sql/sql_partition.cc:
        Fix Bug#51830: Revert part of the patch for Bug#49742, which caused the regression.
      sql/table.cc:
        Fix Bug#46949: memory leak in failed ALTER TABLE with partitioning.
      848df231
  10. 08 Mar, 2010 2 commits
  11. 06 Mar, 2010 1 commit
    • Sergey Petrunya's avatar
      LPBUG#524025 Running RQG outer_join test leads to crash · 4080e909
      Sergey Petrunya authored
      Save no-records constant tables in JOIN::const_table_map before we invoke
      eliminate_tables(). Failure to do so caused crash when the same table was
      marked as constant two times
      
      mysql-test/r/table_elim.result:
        LPBUG#524025 Running RQG outer_join test leads to crash
        - Testcase
      mysql-test/t/table_elim.test:
        LPBUG#524025 Running RQG outer_join test leads to crash
        - Testcase
      sql/sql_select.cc:
        LPBUG#524025 Running RQG outer_join test leads to crash
        Save no-records constant tables in JOIN::const_table_map before we invoke eliminate_tables(). Failure to do so caused crash when the same table was marked as constant two times.
      4080e909
  12. 04 Mar, 2010 1 commit
  13. 23 Feb, 2010 2 commits
  14. 19 Feb, 2010 2 commits