1. 17 May, 2017 8 commits
    • Marko Mäkelä's avatar
      MDEV-12358 Work around what looks like a bug in GCC 7.1.0 · 9f89b94b
      Marko Mäkelä authored
      The parameter thr of the function btr_cur_optimistic_insert()
      is not declared as nonnull, but GCC 7.1.0 with -O3 is wrongly
      optimizing away the first part of the condition
      UNIV_UNLIKELY(thr && thr_get_trx(thr)->fake_changes)
      when the function is being called by row_merge_insert_index_tuples()
      with thr==NULL.
      
      The fake_changes is an XtraDB addition. This GCC bug only appears
      to have an impact on XtraDB, not InnoDB.
      
      We work around the problem by not attempting to dereference thr
      when both BTR_NO_LOCKING_FLAG and BTR_NO_UNDO_LOG_FLAG are set
      in the flags. Probably BTR_NO_LOCKING_FLAG alone should suffice.
      
      btr_cur_optimistic_insert(), btr_cur_pessimistic_insert(),
      btr_cur_pessimistic_update(): Correct comments that disagree with
      usage and with nonnull attributes. No other parameter than thr can
      actually be NULL.
      
      row_ins_duplicate_error_in_clust(): Remove an unused parameter.
      
      innobase_is_fake_change(): Unused function; remove.
      
      ibuf_insert_low(), row_log_table_apply(), row_log_apply(),
      row_undo_mod_clust_low():
      Because we will be passing BTR_NO_LOCKING_FLAG | BTR_NO_UNDO_LOG_FLAG
      in the flags, the trx->fake_changes flag will be treated as false,
      which is the right thing to do at these low-level operations
      (change buffer merge, ALTER TABLE…LOCK=NONE, or ROLLBACK).
      This might be fixing actual XtraDB bugs.
      
      Other callers that pass these two flags are also passing thr=NULL,
      implying fake_changes=false. (Some callers in ROLLBACK are passing
      BTR_NO_LOCKING_FLAG and a nonnull thr. In these callers, fake_changes
      better be false, to avoid corruption.)
      9f89b94b
    • Marko Mäkelä's avatar
      fil_create_new_single_table_tablespace(): Correct a bogus nonnull attribute · e22d86a3
      Marko Mäkelä authored
      The parameter path can be passed as NULL.
      This error was reported by GCC 7.1.0 when compiling
      CMAKE_BUILD_TYPE=Debug with -O3.
      e22d86a3
    • Marko Mäkelä's avatar
      Remove redundant UT_LIST_INIT() calls · 956d2540
      Marko Mäkelä authored
      The macro UT_LIST_INIT() zero-initializes the UT_LIST_NODE.
      There is no need to call this macro on a buffer that has
      already been zero-initialized by mem_zalloc() or mem_heap_zalloc()
      or similar.
      
      For some reason, the statement UT_LIST_INIT(srv_sys->tasks) in
      srv_init() caused a SIGSEGV on server startup when compiling with
      GCC 7.1.0 for AMD64 using -O3. The zero-initialization was attempted
      by the instruction movaps %xmm0,0x50(%rax), while the proper offset
      of srv_sys->tasks would seem to have been 0x48.
      956d2540
    • Marko Mäkelä's avatar
      Never pass NULL to innobase_get_stmt() · 4754f88c
      Marko Mäkelä authored
      4754f88c
    • Marko Mäkelä's avatar
      Silence bogus GCC 7 warnings -Wimplicit-fallthrough · 7972da8a
      Marko Mäkelä authored
      Do not silence uncertain cases, or fix any bugs.
      
      The only functional change should be that ha_federated::extra()
      is not calling DBUG_PRINT to report an unhandled case for
      HA_EXTRA_PREPARE_FOR_DROP.
      7972da8a
    • Marko Mäkelä's avatar
      Fix an incorrect debug assertion · 492c1e41
      Marko Mäkelä authored
      492c1e41
    • Marko Mäkelä's avatar
    • Marko Mäkelä's avatar
      Fix warnings in innochecksum compilation · e63e2fe2
      Marko Mäkelä authored
      e63e2fe2
  2. 16 May, 2017 2 commits
  3. 15 May, 2017 12 commits
    • Sergei Golubchik's avatar
      MDEV-10936 CONNECT engine JDBC type can't find JdbcInterface · a3cf69e2
      Sergei Golubchik authored
      Don't use instal_jar() from Use_Java.cmake -
      at least in CentOS 7 (cmake 2.8.12.2) it doesn't yet support
      the COMPONENT option.
      a3cf69e2
    • Sergei Golubchik's avatar
      MDEV-12660 inconsistent mysql_stmt_close · a8773ef3
      Sergei Golubchik authored
      remove dead code: this "return rc" could've never happened,
      because reset_stmt_handle can only possibly fail if RESET_SERVER
      flag is used.
      
      But this "return rc" was confusing, it was under DBUG_ENTER (while
      not being DBUG_RETURN) and it was skipping required stmt cleanup
      at the end of the function.
      a8773ef3
    • Sergei Golubchik's avatar
      MDEV-11883 MariaDB crashes with out-of-memory when query information_schema · a65623b3
      Sergei Golubchik authored
      CSV engine didn't expect CSM files to be read-only
      a65623b3
    • Sergei Golubchik's avatar
      MDEV-9998 Fix issues caught by Clang's -Wpointer-bool-conversion warning · 71b45032
      Sergei Golubchik authored
      remove useless checks
      and a couple of others
      71b45032
    • Sergei Golubchik's avatar
      MDEV-12761 Error return from external_lock make the server crash · f9264280
      Sergei Golubchik authored
      bunch of bugs when external_lock() fails on unlock:
      * mi_lock_database() used mi_mark_crashed() under share->intern_lock,
        but mi_mark_crashed() itself locks this mutex.
      * handler::close() required table to be unlocked, but failed
        external_lock didn't count as unlock
      * mysql_unlock_tables() ignored all unlock errors, but they still set
        the error status in stmt_da.
      f9264280
    • Sergei Golubchik's avatar
      MDEV-12420 max_recursive_iterations did not prevent a stack-overflow and segfault · 52aa2009
      Sergei Golubchik authored
      post-review fixes
      * move pcre-specific variable out of mysys
      * don't use current_thd
      * move a commonly used macro to my_sys.h
      * remove new sysvar
      52aa2009
    • Daniel Black's avatar
      602b5e4c
    • Daniel Black's avatar
      b30311e5
    • Daniel Black's avatar
      fbc057ad
    • Daniel Black's avatar
      MDEV-12420: PCRE stack overflow · d672f88e
      Daniel Black authored
      It was possible to construct a PCRE expression that exceeded the stack.
      resulting in a crash:
      
      With fix:
      
      MariaDB [(none)]> SELECT 1
          -> FROM dual
          -> WHERE ('Alpha,Bravo,Charlie,Delta,Echo,Foxtrot,StrataCentral,Golf,Hotel,India,Juliet,Kilo,Lima,Mike,StrataL3,November,Oscar,StrataL2,Sand,P3,P4SwitchTest,Arsys,Poppa,ExtensionMgr,Arp,Quebec,Romeo,StrataApiV2,PtReyes,Sierra,SandAcl,Arrow,Artools,BridgeTest,Tango,SandT,PAlaska,Namespace,Agent,Qos,PatchPanel,ProjectReport,Ark,Gimp,Agent,SliceAgent,Arnet,Bgp,Ale,Tommy,Central,AsicPktTestLib,Hsc,SandL3,Abuild,Pca9555,Standby,ControllerDut,CalSys,SandLib,Sb820,PointV2,BfnLib,Evpn,BfnSdk,Sflow,ManagementActive,AutoTest,GatedTest,Bgp,Sand,xinetd,BfnAgentLib,bf-utils,Hello,BfnState,Eos,Artest,Qos,Scd,ThermoMgr,Uniform,EosUtils,Eb,FanController,Central,BfnL3,BfnL2,tcp_wrappers,Victor,Environment,Route,Failover,Whiskey,Xray,Gimp,BfnFixed,Strata,SoCal,XApi,Msrp,XpProfile,tcpdump,PatchPanel,ArosTest,FhTest,Arbus,XpAcl,MacConc,XpApi,telnet,QosTest,Alpha2,BfnVlan,Stp,VxlanControllerTest,MplsAgent,Bravo2,Lanz,BfnMbb,Intf,XCtrl,Unicast,SandTunnel,L3Unicast,Ipsec,MplsTest,Rsvp,EthIntf,StageMgr,Sol,MplsUtils,Nat,Ira,P4NamespaceDut,Counters,Charlie2,Aqlc,Mlag,Power,OpenFlow,Lag,RestApi,BfdTest,strongs,Sfa,CEosUtils,Adt746,MaintenanceMode,MlagDut,EosImage,IpEth,MultiProtocol,Launcher,Max3179,Snmp,Acl,IpEthTest,PhyEee,bf-syslibs,tacc,XpL2,p4-ar-switch,p4-bf-switch,LdpTest,BfnPhy,Mirroring,Phy6,Ptp'
          ->
          -> REGEXP '^((?!\b(Strata|StrataApi|StrataApiV2)\b).)*$');
      Empty set, 1 warning (0.00 sec)
      
      MariaDB [(none)]> show warnings;
      +---------+------+---------------------------------------------------------+
      | Level   | Code | Message                                                 |
      +---------+------+---------------------------------------------------------+
      | Warning | 1139 | Got error 'pcre_exec: Internal error (-21)' from regexp |
      +---------+------+---------------------------------------------------------+
      d672f88e
    • Marko Mäkelä's avatar
      MDEV-12188 information schema - errors populating fail to free memory, unlock mutexes · 217b8115
      Marko Mäkelä authored
      Given the OK macro used in innodb does a DBUG_RETURN(1) on expression failure
      the innodb implementation has a number of errors in i_s.cc.
      
      We introduce a new macro BREAK_IF that replaces some use of the OK macro.
      Also, do some other cleanup detailed below.
      
      When invoking Field::store() on integers, always pass the parameter
      is_unsigned=true to avoid an unnecessary conversion to double.
      
      i_s_fts_deleted_generic_fill(), i_s_fts_config_fill():
      Use the BREAK_IF macro instead of OK.
      
      i_s_fts_index_cache_fill_one_index(), i_s_fts_index_table_fill_one_index():
      Add a parameter for conv_string, and let the caller allocate that buffer.
      
      i_s_fts_index_cache_fill(): Check the return status of
      i_s_fts_index_cache_fill_one_index().
      
      i_s_fts_index_table_fill(): Check the return status of
      i_s_fts_index_table_fill_one_index().
      
      i_s_fts_index_table_fill_one_fetch(): Always let the caller invoke
      i_s_fts_index_table_free_one_fetch().
      
      i_s_innodb_buffer_page_fill(), i_s_innodb_buf_page_lru_fill():
      Do release dict_sys->mutex if filling the buffers fails.
      
      i_s_innodb_buf_page_lru_fill(): Also display the value
      INFORMATION_SCHEMA.INNODB_BUFFER_PAGE.PAGE_IO_FIX='IO_PIN'
      when a block is in that state. Remove the unnecessary variable 'heap'.
      217b8115
    • Marko Mäkelä's avatar
      Fix the Solaris compilation after MDEV-12674 · 8417252b
      Marko Mäkelä authored
      simple_counter::add(): Add a type cast to the os_atomic_increment_ulint()
      call, because GCC would check the type compatibility even when the code
      branch is not being instantiated (atomic=false). On Solaris,
      os_atomic_increment_ulint() actually needs a compatible parameter type,
      and an error would be emitted due to an incompatible 64-bit type,
      for srv_stats.n_lock_wait_time.add(diff_time).
      8417252b
  4. 12 May, 2017 1 commit
    • Marko Mäkelä's avatar
      MDEV-12674 Innodb_row_lock_current_waits has overflow · ff166093
      Marko Mäkelä authored
      There is a race condition related to the variable
      srv_stats.n_lock_wait_current_count, which is only
      incremented and decremented by the function lock_wait_suspend_thread(),
      
      The incrementing is protected by lock_sys->wait_mutex, but the
      decrementing does not appear to be protected by anything.
      This mismatch could allow the counter to be corrupted when a
      transactional InnoDB table or record lock wait is terminating
      roughly at the same time with the start of a wait on a
      (possibly different) lock.
      
      ib_counter_t: Remove some unused methods. Prevent instantiation for N=1.
      Add an inc() method that takes a slot index as a parameter.
      
      single_indexer_t: Remove.
      
      simple_counter<typename Type, bool atomic=false>: A new counter wrapper.
      Optionally use atomic memory operations for modifying the counter.
      Aligned to the cache line size.
      
      lsn_ctr_1_t, ulint_ctr_1_t, int64_ctr_1_t: Define as simple_counter<Type>.
      These counters are either only incremented (and we do not care about
      losing some increment operations), or the increment/decrement operations
      are protected by some mutex.
      
      srv_stats_t::os_log_pending_writes: Document that the number is protected
      by log_sys->mutex.
      
      srv_stats_t::n_lock_wait_current_count: Use simple_counter<ulint, true>,
      that is, atomic inc() and dec() operations.
      
      lock_wait_suspend_thread(): Release the mutexes before incrementing
      the counters. Avoid acquiring the lock mutex if the lock wait has
      already been resolved. Atomically increment and decrement
      srv_stats.n_lock_wait_current_count.
      
      row_insert_for_mysql(), row_update_for_mysql(),
      row_update_cascade_for_mysql(): Use the inc() method with the trx->id
      as the slot index. This is a non-functional change, just using
      inc() instead of add(1).
      
      buf_LRU_get_free_block(): Replace the method add(index, n) with inc().
      There is no slot index in the simple_counter.
      ff166093
  5. 08 May, 2017 1 commit
  6. 05 May, 2017 4 commits
    • Monty's avatar
      MDEV-10104 Table lock race condition with replication · fc25437a
      Monty authored
      Problem was two race condtion in Aria page cache:
      - find_block() didn't inform free_block() that it had released requests
      - free_block() didn't handle pinned blocks, which could happen if
        free_block() was called as part of flush. This is fixed by not freeing
        blocks that are pinned.  This is safe as when maria_close() is called
        when last thread is using a table, there can be no pinned blocks. For
        other flush calls it's safe to ignore pinned blocks.
      fc25437a
    • Monty's avatar
      Fixed some bugs in fork_big.pl which caused some tests to die early · e3521ab9
      Monty authored
      - Changed to 'strict'
      - Fixed scope of variables
      - Made timing smaller for of repair, check, flush and alter to get them to
        trigger earlier
      e3521ab9
    • Marko Mäkelä's avatar
      MDEV-12635 innodb.log_file_size fails when run with Valgrind · bc5c1d99
      Marko Mäkelä authored
      In MariaDB Server before 10.2, InnoDB will not be shut down properly
      if startup fails. So, Valgrind failures are to be expected.
      Disable the test under Valgrind. In 10.2, it should pass with Valgrind.
      bc5c1d99
    • Igor Babaev's avatar
      Fixed the bug mdev-12673. · 15f9931f
      Igor Babaev authored
      This patch corrects the fix for the bug mdev-10693.
      It is critical for the function get_best_combination() not to call
      create_ref_for_key() for constant tables.
      This bug could manifest itself only in multi-table subqueries where
      one of the tables is accessed by a constant primary key.
      15f9931f
  7. 03 May, 2017 1 commit
  8. 02 May, 2017 1 commit
  9. 30 Apr, 2017 1 commit
    • Daniel Black's avatar
      mysqld_safe_help - remove warning · dbe2c3c5
      Daniel Black authored
      /home/travis/build/MariaDB/server/extra/mysqld_safe_helper.c:62:21: warning: too many arguments in call to 'do_usage'
          do_usage(argv[0]);
          ~~~~~~~~        ^
      1 warning generated.
      dbe2c3c5
  10. 25 Apr, 2017 1 commit
  11. 24 Apr, 2017 3 commits
    • Igor Babaev's avatar
      Fixed the bug mdev-10693. · 2e7ba70a
      Igor Babaev authored
      The code that chooses between materialization of a non-correlated
      IN subquery and its transformation into an EXISTS correlated
      subquery assumes that the execution plan for the outer select
      has been already built. However it was not always so if subqueries
      occurred in the expressions used for ref access to tables of
      the outer select. A call of the function create_ref_for_key() in
      get_best_combination() could trigger a premature execution of
      the above mentioned code when the execution plan structures for
      the outer select were not fully built. This could cause a crash
      of the server.
      
      The fix postpones the calls of create_ref_for_key() until the
      structures for the execution plan is fully built.
      2e7ba70a
    • Marko Mäkelä's avatar
      Add and adjust a test from MySQL: · 57fea99e
      Marko Mäkelä authored
      commit 1198267c331b045b9cad26be72b1a5b4f8930a79
      Author: Thirunarayanan Balathandayuthapani <thirunarayanan.balathandayuth@oracle.com>
      Date:   Fri Aug 26 11:00:44 2016 +0530
      
          Bug #20989615   INNODB AUTO_INCREMENT PRODUCES SAME VALUE TWICE
      
      The code fix is already present.
      57fea99e
    • Marko Mäkelä's avatar
      Add and adjust a test from MySQL: · 864548c4
      Marko Mäkelä authored
      commit 12343617922cfd9c48ee84ad6ecf53068d822010
      Author: Thirunarayanan Balathandayuthapani <thirunarayanan.balathandayuth@oracle.com>
      Date:   Fri Jul 15 14:39:37 2016 +0530
      
          Bug #23475211   COMBINING ALTER OPERATIONS TRIGGERS TABLE REBUILD
      
      The code fix is already present.
      864548c4
  12. 22 Apr, 2017 1 commit
  13. 21 Apr, 2017 4 commits
    • Igor Babaev's avatar
      Fixed bug mdev-10053. · 97fb1f26
      Igor Babaev authored
      The implementation of the walk method for the class Item_in_subselect
      was missing. As a result the method never traversed the left operand
      of any IN subquery predicate.
      
      Item_exists_subselect::exists2in_processor() that performs the
      Exist-To-In transformation calls the walk method to collect info
      on outer references. As the walk method did not traverse the
      left operands of the IN subqueries the outer references there
      were not taken into account and some subqueries that were actually
      correlated were marked as uncorrelated. It could lead to an
      attempt of the materialization of such a subquery.
      
      Also added a cleanup for some test cases merged from 5.5.
      97fb1f26
    • Sergei Golubchik's avatar
      fix "cmake -DWITH_PCRE=bundled" · 26ed68dc
      Sergei Golubchik authored
      after building with system
      26ed68dc
    • Sergei Golubchik's avatar
      Merge branch '5.5' into 10.0 · 8d75a753
      Sergei Golubchik authored
      8d75a753
    • Marko Mäkelä's avatar
      Fix some InnoDB type mismatch · e056d1f1
      Marko Mäkelä authored
      On 64-bit Windows, sizeof(ulint)!=sizeof(ulong).
      e056d1f1