1. 01 Oct, 2014 1 commit
  2. 30 Sep, 2014 5 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
  3. 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
  4. 25 Sep, 2014 2 commits
  5. 24 Sep, 2014 3 commits
  6. 23 Sep, 2014 6 commits
  7. 22 Sep, 2014 1 commit
    • Michael Widenius's avatar
      Fixed test failures · 504c6ccc
      Michael Widenius authored
      Added comments
      Ensure that tokudb test works even if jemalloc is not installed
      Removed not referenced function Item::remove_fixed()
      
      mysql-test/suite/rpl/t/rpl_gtid_reconnect.test:
        Fixed race condition
      sql/item.cc:
        Indentation fix
      sql/item.h:
        Removed not used function
        Added comment
      sql/sql_select.cc:
        Fixed indentation
      storage/tokudb/mysql-test/rpl/include/have_tokudb.opt:
        Ensure that tokudb test works even if jemalloc is not installed
      storage/tokudb/mysql-test/tokudb/suite.opt:
        Ensure that tokudb test works even if jemalloc is not installed
      storage/tokudb/mysql-test/tokudb_add_index/suite.opt:
        Ensure that tokudb test works even if jemalloc is not installed
      storage/tokudb/mysql-test/tokudb_alter_table/suite.opt:
        Ensure that tokudb test works even if jemalloc is not installed
      storage/tokudb/mysql-test/tokudb_bugs/suite.opt:
        Ensure that tokudb test works even if jemalloc is not installed
      storage/tokudb/mysql-test/tokudb_mariadb/suite.opt:
        Ensure that tokudb test works even if jemalloc is not installed
      504c6ccc
  8. 19 Sep, 2014 1 commit
  9. 18 Sep, 2014 5 commits
  10. 17 Sep, 2014 2 commits
    • Sergei Golubchik's avatar
      fixes for valgrind failures · c338772a
      Sergei Golubchik authored
      sql/item.cc:
        don't forget to adjust the length of the string when removing leading spaces
      sql/sql_acl.cc:
        when updating the hostname of the ACL_USER, update the hostname_length too
      sql/sql_parse.cc:
        first compare the username string, then test the host pointer
        (host pointer is undefined when the username string is one of the hard-coded values
        set by the parser). This is not a bug, old code is perfectly safe as the undefined
        host pointer is never dereferenced, but let's keep valgrind happy.
      c338772a
    • Sergei Golubchik's avatar
      fix intermittent failures of main.create_or_replace test in buildbot · b04748c8
      Sergei Golubchik authored
      don't kill statements in the default connection, kill them in a connection that
      will be closed - it'll guarantee that `KILL con_id` will not apply to unrelated statements.
      b04748c8
  11. 16 Sep, 2014 5 commits
  12. 15 Sep, 2014 8 commits
    • Michael Widenius's avatar
      Auto merge · 8db1f728
      Michael Widenius authored
      8db1f728
    • Michael Widenius's avatar
      Don't give warning if there are two unique keys used with INSERT .. ON DUPLICATE KEY UPDATE. · 8e4566e9
      Michael Widenius authored
      We should assume that the store engine will report the first duplicate key for this case.
      
      Old code of suppression of unsafe logging error with LIMIT didn't work, because of wrong usage of my_interval_timer().
      
      Suppress unsafe logging errors to the error log if we get too many unsafe logging errors in a short time.
      This is to not overflow the error log with meaningless errors.
      
      - Each error code is suppressed and counted separately.
      - We do a 5 minute suppression of new errors if we get more than 10 errors in that time.
      
      Only print unsafe logging errors if log_warnings > 1.
      
      
      
      mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result:
        Update test results as INSERT ... ON DUPLICATE KEY UPDATE doesn't get logged anymore
      mysql-test/suite/binlog/r/binlog_unsafe.result:
        Update test results as INSERT ... ON DUPLICATE KEY UPDATE doesn't get logged anymore
      mysql-test/suite/engines/README:
        Fixed typos
      mysql-test/suite/rpl/r/rpl_known_bugs_detection.result:
        Update test results as INSERT ... ON DUPLICATE KEY UPDATE doesn't get logged anymore
      sql/sql_base.cc:
        Don't log warning if there are two unique keys used with INSERT .. ON DUPLICATE KEY UPDATE.
        We should assume that the store engine will report the first duplicate key for this case.
      sql/sql_class.cc:
        Suppress error in binary log if we get too many unsafe logging errors in a short time.
        Only print unsafe logging errors if log_warnings > 1
      8e4566e9
    • Michael Widenius's avatar
      Fixed randomly failing test · e167c48a
      Michael Widenius authored
      e167c48a
    • Rich Prohaska's avatar
      bb75cf06
    • Sergei Golubchik's avatar
    • Elena Stepanova's avatar
      Changes in storage_engine test suite: · b41d5aeb
      Elena Stepanova authored
        - added more logic for ON DUPICATE KEY UPDATE upon Monty's request;
        - added an overlay for XtraDB
      b41d5aeb
    • Michael Widenius's avatar
      Use LOCK_show_status when we add things to all_status_vars · 7a50ce1d
      Michael Widenius authored
      This was missing in my last commit for fixing possible lockups in SHOW STATUS.
      
      sql/log.cc:
        Fixed comment
      sql/sql_show.cc:
        Use LOCK_show_status when we add things to all_status_vars
      sql/sql_test.cc:
        Remove not needed mutex_lock
      7a50ce1d
    • Rich Prohaska's avatar
      DB-714 read free replication · b183d81d
      Rich Prohaska authored
      b183d81d