1. 06 Oct, 2014 1 commit
    • Sergey Petrunya's avatar
      MDEV-6442: Assertion `join->best_read < double(...)' failed with... · 68717310
      Sergey Petrunya authored
      MDEV-6442: Assertion `join->best_read < double(...)' failed with optimizer_use_condition_selectivity >=3
      
      - Fix the crash by making get_column_range_cardinality() 
        to handle the special case where Column_stats objects 
        is an all-zeros object (the question of what is the point
        of having Field::read_stats point to such object remains a 
        mystery)
      
      - Added a few comments. Learning the code still.
      68717310
  2. 10 Oct, 2014 3 commits
  3. 09 Oct, 2014 2 commits
  4. 06 Oct, 2014 1 commit
    • Sergey Petrunya's avatar
      MDEV-6442: Assertion `join->best_read < double(...)' failed with... · fd4c9af3
      Sergey Petrunya authored
      MDEV-6442: Assertion `join->best_read < double(...)' failed with optimizer_use_condition_selectivity >=3
      
      - Fix the crash by making get_column_range_cardinality() 
        to handle the special case where Column_stats objects 
        is an all-zeros object (the question of what is the point
        of having Field::read_stats point to such object remains a 
        mystery)
      
      - Added a few comments. Learning the code still.
      
      fd4c9af3
  5. 05 Oct, 2014 2 commits
    • Sergei Golubchik's avatar
      fix failing rpl.rpl_user_variables · 689ffe35
      Sergei Golubchik authored
      typo fixed. use correct constant.
      689ffe35
    • Sergei Golubchik's avatar
      fix main.mysqldump test failing after Mroonga merge. · 3050b290
      Sergei Golubchik authored
      mysqlimport had code for multi-threaded import. By mistake it was disabled for
      many years, at least since 5.5 (more likely even in 5.1), but mysqlimport happily
      accepted (and ignored) --use-threads option ever since.
      
      After Mroonga merge HAVE_LIBPTHREAD became defined and multi-threaded import
      suddenly came to life. As it exit() the program brutally on any error (never mind
      that some import threads may be running) mysys rightfully complains. Safemalloc
      complains too in debug builds.
      
      Fix: don't try a clean exit on an error, don't shutdown mysys and tell safemalloc
      to shut up. Yes, and remove #ifdef HAVE_LIBPTHREAD, since 5.5 the client library
      is always multi-threaded.
      3050b290
  6. 04 Oct, 2014 3 commits
  7. 03 Oct, 2014 2 commits
  8. 02 Oct, 2014 2 commits
  9. 01 Oct, 2014 3 commits
  10. 30 Sep, 2014 8 commits
    • Michael Widenius's avatar
      Auto merge · 213a4a93
      Michael Widenius authored
      213a4a93
    • Michael Widenius's avatar
      MDEV-5120 Test suite test maria-no-logging fails · 70823e1d
      Michael Widenius authored
      The reason for the failure was a bug in an include file on debian that causes 'struct stat'
      to have different sized depending on the environment.
      
      This patch fixes so that we always include my_global.h or my_config.h before we include any other files.
      
      Other things:
      - Removed #include <my_global.h> in some include files; Better to always do this at the top level to have as few
        "always-include-this-file-first' files as possible.
      - Removed usage of some include files that where already included by my_global.h or by other files.
      
      
      client/mysql_plugin.c:
        Use my_global.h first
      client/mysqlslap.c:
        Remove duplicated include files
      extra/comp_err.c:
        Remove duplicated include files
      include/m_string.h:
        Remove duplicated include files
      include/maria.h:
        Remove duplicated include files
      libmysqld/emb_qcache.cc:
        Use my_global.h first
      plugin/semisync/semisync.h:
        Use my_pthread.h first
      sql/datadict.cc:
        Use my_global.h first
      sql/debug_sync.cc:
        Use my_global.h first
      sql/derror.cc:
        Use my_global.h first
      sql/des_key_file.cc:
        Use my_global.h first
      sql/discover.cc:
        Use my_global.h first
      sql/event_data_objects.cc:
        Use my_global.h first
      sql/event_db_repository.cc:
        Use my_global.h first
      sql/event_parse_data.cc:
        Use my_global.h first
      sql/event_queue.cc:
        Use my_global.h first
      sql/event_scheduler.cc:
        Use my_global.h first
      sql/events.cc:
        Use my_global.h first
      sql/field.cc:
        Use my_global.h first
        Remove duplicated include files
      sql/field_conv.cc:
        Use my_global.h first
      sql/filesort.cc:
        Use my_global.h first
        Remove duplicated include files
      sql/gstream.cc:
        Use my_global.h first
      sql/ha_ndbcluster.cc:
        Use my_global.h first
      sql/ha_ndbcluster_binlog.cc:
        Use my_global.h first
      sql/ha_ndbcluster_cond.cc:
        Use my_global.h first
      sql/ha_partition.cc:
        Use my_global.h first
      sql/handler.cc:
        Use my_global.h first
      sql/hash_filo.cc:
        Use my_global.h first
      sql/hostname.cc:
        Use my_global.h first
      sql/init.cc:
        Use my_global.h first
      sql/item.cc:
        Use my_global.h first
      sql/item_buff.cc:
        Use my_global.h first
      sql/item_cmpfunc.cc:
        Use my_global.h first
      sql/item_create.cc:
        Use my_global.h first
      sql/item_geofunc.cc:
        Use my_global.h first
      sql/item_inetfunc.cc:
        Use my_global.h first
      sql/item_row.cc:
        Use my_global.h first
      sql/item_strfunc.cc:
        Use my_global.h first
      sql/item_subselect.cc:
        Use my_global.h first
      sql/item_sum.cc:
        Use my_global.h first
      sql/item_timefunc.cc:
        Use my_global.h first
      sql/item_xmlfunc.cc:
        Use my_global.h first
      sql/key.cc:
        Use my_global.h first
      sql/lock.cc:
        Use my_global.h first
      sql/log.cc:
        Use my_global.h first
      sql/log_event.cc:
        Use my_global.h first
      sql/log_event_old.cc:
        Use my_global.h first
      sql/mf_iocache.cc:
        Use my_global.h first
      sql/mysql_install_db.cc:
        Remove duplicated include files
      sql/mysqld.cc:
        Remove duplicated include files
      sql/net_serv.cc:
        Remove duplicated include files
      sql/opt_range.cc:
        Use my_global.h first
      sql/opt_subselect.cc:
        Use my_global.h first
      sql/opt_sum.cc:
        Use my_global.h first
      sql/parse_file.cc:
        Use my_global.h first
      sql/partition_info.cc:
        Use my_global.h first
      sql/procedure.cc:
        Use my_global.h first
      sql/protocol.cc:
        Use my_global.h first
      sql/records.cc:
        Use my_global.h first
      sql/records.h:
        Don't include my_global.h
        Better to do this at the upper level
      sql/repl_failsafe.cc:
        Use my_global.h first
      sql/rpl_filter.cc:
        Use my_global.h first
      sql/rpl_gtid.cc:
        Use my_global.h first
      sql/rpl_handler.cc:
        Use my_global.h first
      sql/rpl_injector.cc:
        Use my_global.h first
      sql/rpl_record.cc:
        Use my_global.h first
      sql/rpl_record_old.cc:
        Use my_global.h first
      sql/rpl_reporting.cc:
        Use my_global.h first
      sql/rpl_rli.cc:
        Use my_global.h first
      sql/rpl_tblmap.cc:
        Use my_global.h first
      sql/rpl_utility.cc:
        Use my_global.h first
      sql/set_var.cc:
        Added comment
      sql/slave.cc:
        Use my_global.h first
      sql/sp.cc:
        Use my_global.h first
      sql/sp_cache.cc:
        Use my_global.h first
      sql/sp_head.cc:
        Use my_global.h first
      sql/sp_pcontext.cc:
        Use my_global.h first
      sql/sp_rcontext.cc:
        Use my_global.h first
      sql/spatial.cc:
        Use my_global.h first
      sql/sql_acl.cc:
        Use my_global.h first
      sql/sql_admin.cc:
        Use my_global.h first
      sql/sql_analyse.cc:
        Use my_global.h first
      sql/sql_audit.cc:
        Use my_global.h first
      sql/sql_base.cc:
        Use my_global.h first
      sql/sql_binlog.cc:
        Use my_global.h first
      sql/sql_bootstrap.cc:
        Use my_global.h first
        Use my_global.h first
      sql/sql_cache.cc:
        Use my_global.h first
      sql/sql_class.cc:
        Use my_global.h first
      sql/sql_client.cc:
        Use my_global.h first
      sql/sql_connect.cc:
        Use my_global.h first
      sql/sql_crypt.cc:
        Use my_global.h first
      sql/sql_cursor.cc:
        Use my_global.h first
      sql/sql_db.cc:
        Use my_global.h first
      sql/sql_delete.cc:
        Use my_global.h first
      sql/sql_derived.cc:
        Use my_global.h first
      sql/sql_do.cc:
        Use my_global.h first
      sql/sql_error.cc:
        Use my_global.h first
      sql/sql_explain.cc:
        Use my_global.h first
      sql/sql_expression_cache.cc:
        Use my_global.h first
      sql/sql_handler.cc:
        Use my_global.h first
      sql/sql_help.cc:
        Use my_global.h first
      sql/sql_insert.cc:
        Use my_global.h first
      sql/sql_lex.cc:
        Use my_global.h first
      sql/sql_load.cc:
        Use my_global.h first
      sql/sql_locale.cc:
        Use my_global.h first
      sql/sql_manager.cc:
        Use my_global.h first
      sql/sql_parse.cc:
        Use my_global.h first
      sql/sql_partition.cc:
        Use my_global.h first
      sql/sql_plugin.cc:
        Added comment
      sql/sql_prepare.cc:
        Use my_global.h first
      sql/sql_priv.h:
        Added error if we use this before including my_global.h
        This check is here becasue so many files includes sql_priv.h first.
      sql/sql_profile.cc:
        Use my_global.h first
      sql/sql_reload.cc:
        Use my_global.h first
      sql/sql_rename.cc:
        Use my_global.h first
      sql/sql_repl.cc:
        Use my_global.h first
      sql/sql_select.cc:
        Use my_global.h first
      sql/sql_servers.cc:
        Use my_global.h first
      sql/sql_show.cc:
        Added comment
      sql/sql_signal.cc:
        Use my_global.h first
      sql/sql_statistics.cc:
        Use my_global.h first
      sql/sql_table.cc:
        Use my_global.h first
      sql/sql_tablespace.cc:
        Use my_global.h first
      sql/sql_test.cc:
        Use my_global.h first
      sql/sql_time.cc:
        Use my_global.h first
      sql/sql_trigger.cc:
        Use my_global.h first
      sql/sql_udf.cc:
        Use my_global.h first
      sql/sql_union.cc:
        Use my_global.h first
      sql/sql_update.cc:
        Use my_global.h first
      sql/sql_view.cc:
        Use my_global.h first
      sql/sys_vars.cc:
        Added comment
      sql/table.cc:
        Use my_global.h first
      sql/thr_malloc.cc:
        Use my_global.h first
      sql/transaction.cc:
        Use my_global.h first
      sql/uniques.cc:
        Use my_global.h first
      sql/unireg.cc:
        Use my_global.h first
      sql/unireg.h:
        Removed inclusion of my_global.h
      storage/archive/ha_archive.cc:
        Added comment
      storage/blackhole/ha_blackhole.cc:
        Use my_global.h first
      storage/csv/ha_tina.cc:
        Use my_global.h first
      storage/csv/transparent_file.cc:
        Use my_global.h first
      storage/federated/ha_federated.cc:
        Use my_global.h first
      storage/federatedx/federatedx_io.cc:
        Use my_global.h first
      storage/federatedx/federatedx_io_mysql.cc:
        Use my_global.h first
      storage/federatedx/federatedx_io_null.cc:
        Use my_global.h first
      storage/federatedx/federatedx_txn.cc:
        Use my_global.h first
      storage/heap/ha_heap.cc:
        Use my_global.h first
      storage/innobase/handler/handler0alter.cc:
        Use my_global.h first
      storage/maria/ha_maria.cc:
        Use my_global.h first
      storage/maria/unittest/ma_maria_log_cleanup.c:
        Remove duplicated include files
      storage/maria/unittest/test_file.c:
        Added comment
      storage/myisam/ha_myisam.cc:
        Move sql_plugin.h first as this includes my_global.h
      storage/myisammrg/ha_myisammrg.cc:
        Use my_global.h first
      storage/oqgraph/oqgraph_thunk.cc:
        Use my_config.h and my_global.h first
        One could not include my_global.h before oqgraph_thunk.h (don't know why)
      storage/spider/ha_spider.cc:
        Use my_global.h first
      storage/spider/hs_client/config.cpp:
        Use my_global.h first
      storage/spider/hs_client/escape.cpp:
        Use my_global.h first
      storage/spider/hs_client/fatal.cpp:
        Use my_global.h first
      storage/spider/hs_client/hstcpcli.cpp:
        Use my_global.h first
      storage/spider/hs_client/socket.cpp:
        Use my_global.h first
      storage/spider/hs_client/string_util.cpp:
        Use my_global.h first
      storage/spider/spd_conn.cc:
        Use my_global.h first
      storage/spider/spd_copy_tables.cc:
        Use my_global.h first
      storage/spider/spd_db_conn.cc:
        Use my_global.h first
      storage/spider/spd_db_handlersocket.cc:
        Use my_global.h first
      storage/spider/spd_db_mysql.cc:
        Use my_global.h first
      storage/spider/spd_db_oracle.cc:
        Use my_global.h first
      storage/spider/spd_direct_sql.cc:
        Use my_global.h first
      storage/spider/spd_i_s.cc:
        Use my_global.h first
      storage/spider/spd_malloc.cc:
        Use my_global.h first
      storage/spider/spd_param.cc:
        Use my_global.h first
      storage/spider/spd_ping_table.cc:
        Use my_global.h first
      storage/spider/spd_sys_table.cc:
        Use my_global.h first
      storage/spider/spd_table.cc:
        Use my_global.h first
      storage/spider/spd_trx.cc:
        Use my_global.h first
      storage/xtradb/handler/handler0alter.cc:
        Use my_global.h first
      storage/xtradb/handler/i_s.cc:
        Use my_global.h first
      70823e1d
    • Sergey Petrunya's avatar
      MDEV-6808, part#2. · 5a677749
      Sergey Petrunya authored
      Fix apparently-wrong code in table_multi_eq_selectivity().
      5a677749
    • Michael Widenius's avatar
      Fixed warnings · caca6b99
      Michael Widenius authored
      storage/oqgraph/ha_oqgraph.cc:
        Fixed compiler warning
      storage/xtradb/handler/ha_innodb.cc:
        Ifdef:ed note used function
      caca6b99
    • Sergey Petrunya's avatar
      MDEV-6808: MariaDB 10.0.13 crash with optimizer_use_condition_selectivity > 1 · 9aeeba48
      Sergey Petrunya authored
      Fix a trivial typo: in table_multi_eq_cond_selectivity(), reset the loop variable
      between loops.
      9aeeba48
    • Sergei Golubchik's avatar
      4a784356
    • Sergei Golubchik's avatar
      fix more sql_command_flags: · 9fe7feb8
      Sergei Golubchik authored
        SQLCOM_ASSIGN_TO_KEYCACHE should not be CF_AUTO_COMMIT_TRANS
        SQLCOM_PRELOAD_KEYS should not be CF_AUTO_COMMIT_TRANS
        SQLCOM_INSTALL_PLUGIN should need CF_AUTO_COMMIT_TRANS
        SQLCOM_UNINSTALL_PLUGIN should need CF_AUTO_COMMIT_TRANS
      9fe7feb8
    • Sergei Golubchik's avatar
      BUG#13627921 - MISSING FLAGS IN SQL_COMMAND_FLAGS MAY LEAD TO REPLICATION PROBLEMS · 75908fc4
      Sergei Golubchik authored
      merge from MySQL-5.6, revision:
      
      revno: 3677.2.1
      committer: Alfranio Correia <alfranio.correia@oracle.com>
      timestamp: Tue 2012-02-28 16:26:37 +0000
      message:
        BUG#13627921 - MISSING FLAGS IN SQL_COMMAND_FLAGS MAY LEAD TO REPLICATION PROBLEMS
      
        Flags in sql_command_flags[command] are not correctly set for the following
        commands:
      
          . SQLCOM_SET_OPTION is missing CF_CAN_GENERATE_ROW_EVENTS;
          . SQLCOM_BINLOG_BASE64_EVENT is missing CF_CAN_GENERATE_ROW_EVENTS;
          . SQLCOM_REVOKE_ALL is missing CF_CHANGES_DATA;
          . SQLCOM_CREATE_FUNCTION is missing CF_AUTO_COMMIT_TRANS;
      
        This may lead to a wrong sequence of events in the binary log. To fix
        the problem, we correctly set the flags in sql_command_flags[command].
      75908fc4
  11. 03 Oct, 2014 1 commit
  12. 30 Sep, 2014 1 commit
    • Olivier Bertrand's avatar
      - Fix MDEV-6802 in a clean way. · 38c3fd20
      Olivier Bertrand authored
        Add an union in the PARM structure to contain int values
        Use a cast to ptrdiff_t in MAPFAM/MXPFAM::InitDelete required by some compilers
      modified:
        storage/connect/array.cpp
        storage/connect/filamap.cpp
        storage/connect/filamtxt.cpp
        storage/connect/global.h
        
      - Suppress some GCC warnings
      modified:
        storage/connect/array.cpp
        storage/connect/filter.cpp
        storage/connect/tabdos.cpp
        storage/connect/tabmysql.cpp
        storage/connect/value.cpp
      38c3fd20
  13. 29 Sep, 2014 3 commits
  14. 27 Sep, 2014 2 commits
    • Olivier Bertrand's avatar
      - Add some new tests · ed72d2d2
      Olivier Bertrand authored
      added:
        storage/connect/mysql-test/connect/r/datest.result
        storage/connect/mysql-test/connect/r/mrr.result
        storage/connect/mysql-test/connect/r/updelx2.result
        storage/connect/mysql-test/connect/t/datest.test
        storage/connect/mysql-test/connect/t/mrr.test
        storage/connect/mysql-test/connect/t/updelx2.test
      ed72d2d2
    • Olivier Bertrand's avatar
      - Fix: Crash of an XCOL table when the Colname column size is too small. · 8585a6b5
      Olivier Bertrand authored
        Was because of buffer overrun in XCLCOL::ReadColumn.
        The Cbuf buffer was unconditionally filled Now it is limited to its size.
        This happened because this buffer was allocated according to the XCOL
        column size. It is now allocated according to the source column size.
      modified:
        storage/connect/plgdbsem.h
        storage/connect/tabutil.h
        storage/connect/tabxcl.cpp
        storage/connect/tabxcl.h
      8585a6b5
  15. 26 Sep, 2014 1 commit
    • Sergey Petrunya's avatar
      MDEV-6799: Crash in field_conv, memcpy_field_possible · 4630732f
      Sergey Petrunya authored
      - Fix the crash, dont call from->type() at the start of the function
        because it might be unsafe.
      - Unfortunately there is no testcase
      - And this is also the reason we can't fix it properly (it should be
        safe to call from->type() here).
      4630732f
  16. 25 Sep, 2014 2 commits
  17. 24 Sep, 2014 3 commits