1. 11 Jan, 2017 2 commits
  2. 10 Jan, 2017 3 commits
    • Marko Mäkelä's avatar
      Merge 10.1 into 10.2 · f27ca6f6
      Marko Mäkelä authored
      f27ca6f6
    • Marko Mäkelä's avatar
      Merge 10.0 into 10.1 · 5044dae2
      Marko Mäkelä authored
      5044dae2
    • Marko Mäkelä's avatar
      Fix an innodb_plugin leak noted in MDEV-11686 · 78e6fafc
      Marko Mäkelä authored
      buf_flush_init_flush_rbt() was called too early in MariaDB server 10.0,
      10.1, MySQL 5.5 and MySQL 5.6. The memory leak has been fixed in
      the XtraDB storage engine and in MySQL 5.7.
      
      As a result, when the server is started to initialize new data files,
      the buf_pool->flush_rbt will be created unnecessarily and then leaked.
      This memory leak was noticed in MariaDB server 10.1 when running the
      test encryption.innodb_first_page.
      78e6fafc
  3. 09 Jan, 2017 4 commits
  4. 08 Jan, 2017 1 commit
    • Monty's avatar
      MDEV-11317: `! is_set()' or `!is_set() || (m_status == DA_OK_BULK &&... · eed319b6
      Monty authored
      MDEV-11317: `! is_set()' or `!is_set() || (m_status == DA_OK_BULK && is_bulk_op())' fails in Diagnostics_area::set_ok_status on CREATE OR REPLACE with ARCHIVE table
      
      Problem was with deleting non existing .frm file for a storage engine that
      doesn't have .frm files (yet)
      
      Fixed by not giving an error for non existing .frm files for storage engines
      that are using discovery
      Fixed also valgrind supression related to the given test case
      eed319b6
  5. 07 Jan, 2017 3 commits
  6. 06 Jan, 2017 7 commits
    • Vladislav Vaintroub's avatar
      MDEV-11087 Search path for my.ini is wrong for default installation · eaf6b053
      Vladislav Vaintroub authored
      Add <install_root>/data/my.ini to the search path -  this my.ini location
      is used since MariaDB 5.2
      eaf6b053
    • Vladislav Vaintroub's avatar
      Windows : use meaningful DEFAULT_MYSQL_HOME - base directory · 82b8741a
      Vladislav Vaintroub authored
      for the default installation.
      
      It is now defined as "C:/Program Files/MariaDB ${MYSQL_BASE_VERSION}"
      which is where installer indeed puts it by default.
      
      It still does not cover every case -32bit installer on 64 bit Windows would put installation
      root under  "C:/Program Files (x86)", but better than the path used
      previously C:/MariaDB${MYSQL_BASE_VERSION}, which was never correct.
      82b8741a
    • Vladislav Vaintroub's avatar
      MDEV-11088 Client plugins cannot be loaded by command line tools · ae6eb7a0
      Vladislav Vaintroub authored
      in default installation.
      
      Added plugin-dir to the [client] section of the generated my.ini,
      so that  installed services (MSI or mysql_install_db.exe) would be able to
      find plugin directory.
      ae6eb7a0
    • Marko Mäkelä's avatar
      Suppress warnings of NUMA not working. · bbd4844a
      Marko Mäkelä authored
      bbd4844a
    • Marko Mäkelä's avatar
      ac0b0efa
    • Dmitry Lenev's avatar
      MDEV-9084 Calling a stored function from a nested select from temporary table... · e4978d26
      Dmitry Lenev authored
      MDEV-9084 Calling a stored function from a nested select from temporary table causes unpredictable behavior
      
      Cherry-pick: f4a0af070ce49abae60040f6f32e1074309c27fb
      Author: Dmitry Lenev <dmitry.lenev@oracle.com>
      Date:   Mon Jul 25 16:06:52 2016 +0300
      
        Fix for bug #16672723 "CAN'T FIND TEMPORARY TABLE".
      
        Attempt to execute prepared CREATE TABLE SELECT statement which used
        temporary table in the subquery in FROM clause and stored function
        failed with unwarranted ER_NO_SUCH_TABLE error. The same happened
        when such statement was used in stored procedure and this procedure
        was re-executed.
      
        The problem occurred because execution of such prepared statement/its
        re-execution as part of stored procedure incorrectly set
        Query_table_list::query_tables_own_last marker, indicating the last
        table which is directly used by statement. As result temporary table
        used in the subquery was treated as indirectly used/belonging to
        prelocking list and was not pre-opened by open_temporary_tables()
        call before statement execution. Thus causing ER_NO_SUCH_TABLE errors
        since our code assumes that temporary tables need to be correctly
        pre-opened before statement execution.
      
        This problem became visible only in version 5.6 after patches related to
        bug 11746602/27480 "EXTEND CREATE TEMPORARY TABLES PRIVILEGE TO ALLOW
        TEMP TABLE OPERATIONS" since they have introduced pre-opening of temporary
        tables for statements.
      
        Incorrect setting of Query_table_list::query_tables_own_last happened
        in LEX::first_lists_tables_same() method which is called by CREATE TABLE
        SELECT implementation as part of LEX::unlink_first_table(), which temporary
        excludes table list element for table being created from the query table
        list before handling SELECT part.
      
        LEX::first_lists_tables_same() tries to ensure that global table list of
        the statement starts with the first table list element from the first
        statement select. To do this it moves such table list element to the head
        of the global table list. If this table happens to be last directly-used
        table for the statement, query_tables_own_last marker is pointing to it.
        Since this marker was not updated when table list element was moved we
        ended up with all tables except the first table separated by it as if
        they were not directly used by statement (i.e. belonged to prelocked
        tables list).
      
        This fix changes code of LEX::first_lists_tables_same() to update
        query_tables_own_last marker in cases when it points to the table
        being moved. It is set to the table which precedes table being moved
        in this case.
      e4978d26
    • Kristian Nielsen's avatar
      MDEV-10271: Stopped SQL slave thread doesn't print a message to error log like IO thread does · 43378f36
      Kristian Nielsen authored
      Make the slave SQL thread always output to the error log the message "Slave
      SQL thread exiting, replication stopped in ..." whenever it previously
      outputted "Slave SQL thread initialized, starting replication ...".
      
      Before this patch, it was somewhat inconsistent in which cases the message
      would be output and in which not, depending on the exact time and cause of
      the condition that caused the SQL thread to stop.
      43378f36
  7. 05 Jan, 2017 12 commits
    • Elena Stepanova's avatar
      Replication tests fail on valgrind due to waiting-related timeouts · 670b8580
      Elena Stepanova authored
      MTR raises default wait_for_pos_timeout from 300 to 1500 when tests
      are run with valgrind. The same needs to be done for other
      replication-related waits.
      
      The change should fix one of failures mentioned in MDEV-10653
      (rpl.rpl_parallel fails in buildbot with timeout), the one
      on the valgrind builder; but not all of them
      670b8580
    • Elena Stepanova's avatar
      MDEV-10988 Sphinx test suite refuses to run silently · b2b6cf49
      Elena Stepanova authored
      Add diagnostics output if any Sphinx components aren't found
      b2b6cf49
    • Marko Mäkelä's avatar
      Merge 10.1 into 10.2 · 4ce579d2
      Marko Mäkelä authored
      4ce579d2
    • Marko Mäkelä's avatar
      Merge 10.0 into 10.1 · 8049d2e9
      Marko Mäkelä authored
      8049d2e9
    • Marko Mäkelä's avatar
      MDEV-11730 Memory leak in innodb.innodb_corrupt_bit · f0c19b6a
      Marko Mäkelä authored
      Memory was leaked when ALTER TABLE is attempted on a table
      that contains corrupted indexes.
      The memory leak was reported by AddressSanitizer for the test
      innodb.innodb_corrupt_bit. The leak was introduced into
      MariaDB Server 10.0.26, 10.1.15, 10.2.1 by the following:
      
      commit c081c978
      Merge: 1d21b221 a482e76e
      Author: Sergei Golubchik <serg@mariadb.org>
      Date:   Tue Jun 21 14:11:02 2016 +0200
      
         Merge branch '5.5' into bb-10.0
      f0c19b6a
    • Marko Mäkelä's avatar
      Merge 10.1 to 10.2. · 11b7dff5
      Marko Mäkelä authored
      This makes no functional change to MariaDB Server 10.2.
      XtraDB is not being built, and in InnoDB, there was no
      memory leak in buf_dblwr_process() in MariaDB Server 10.2.
      11b7dff5
    • Marko Mäkelä's avatar
      fb5ee7d6
    • Marko Mäkelä's avatar
      Post-merge fix for MDEV-11638. · 30f27b0d
      Marko Mäkelä authored
      logs_empty_and_mark_files_at_shutdown(): Wait for the log_scrub_thread
      to exit.
      30f27b0d
    • Marko Mäkelä's avatar
      Fix InnoDB compilation warnings. · a8ac6dc5
      Marko Mäkelä authored
      Most of them are trivial, except for the thread_sync_t refactoring.
      We must not invoke memset() on non-POD objects.
      
      mtflush_work_initialized: Remove. Refer to mtflush_ctx != NULL instead.
      
      thread_sync_t::thread_sync_t(): Refactored from
      buf_mtflu_handler_init().
      
      thread_sync_t::~thread_sync_t(): Refactored from
      buf_mtflu_io_thread_exit().
      a8ac6dc5
    • Marko Mäkelä's avatar
      MDEV-11713 Optimize DBUG_PRINT and introduce DBUG_LOG · bf35deda
      Marko Mäkelä authored
      MariaDB Server is unnecessarily evaluating the arguments of
      DBUG_PRINT() macros when the label is not defined.
      
      The macro DBUG_LOG() for C++ operator<< output which was added for
      InnoDB diagnostics in MySQL 5.7 is missing from MariaDB. Unlike the
      MySQL 5.7 implementation, MariaDB will avoid allocating and
      initializing the output string when the label is not defined.
      
      Introduce DBUG_OUT("crypt") and DBUG_OUT("checksum") for some InnoDB
      diagnostics, replacing some use of ib::info().
      bf35deda
    • Marko Mäkelä's avatar
      Merge 10.1 to 10.2 · 4e7b382d
      Marko Mäkelä authored
      Most conflicts are related to the MDEV-11638 InnoDB shutdown refactoring.
      4e7b382d
    • Marko Mäkelä's avatar
      Post-push fix for Part 1 of MDEV-8139 Fix scrubbing tests · 758af98f
      Marko Mäkelä authored
      In the backport of Bug#24450908 UNDO LOG EXISTS AFTER SLOW SHUTDOWN
      from MySQL 5.7 to the MySQL 5.6 based MariaDB Server 10.1, we must
      use a mutex when HAVE_ATOMIC_BUILTINS is not defined.
      
      Also, correct a function comment. In MySQL 5.6 and MariaDB Server 10.1,
      also temporary InnoDB tables are redo-logged.
      758af98f
  8. 04 Jan, 2017 7 commits
    • Igor Babaev's avatar
      Fixed bug mdev-11674. · 348ccb6f
      Igor Babaev authored
      1. The rows of a recursive CTE at some point may overflow
      the HEAP temporary table containing them. At this point
      the table is converted to a MyISAM temporary table and the
      new added rows are placed into this MyISAM table.
      A bug in the of select_union_recursive::send_data prevented
      the server from writing the row that caused the overflow
      into the temporary table used for the result of the iteration
      steps. This could lead, in particular,to a premature end
      of the iterations.
      2. The method TABLE::insert_all_rows_into() that was used
      to copy all rows of one temporary table into another
      did not take into account that the destination temporary
      table must be converted to a MyISAM table at some point.
      This patch fixed this problem. It also renamed the method
      into TABLE::insert_all_rows_into_tmp_table() and added
      an extra parameter needed for the conversion.
      348ccb6f
    • Marko Mäkelä's avatar
      MDEV-8139 Fix scrubbing tests · ffb38c97
      Marko Mäkelä authored
      encryption.innodb_scrub: Clean up. Make it also cover ROW_FORMAT=COMPRESSED,
      removing the need for encryption.innodb_scrub_compressed.
      Add a FIXME comment saying that we should create a secondary index, to
      demonstrate that also undo log pages get scrubbed. Currently that is
      not working!
      
      Also clean up encryption.innodb_scrub_background, but keep it disabled,
      because the background scrubbing does not work reliably.
      
      Fix both tests so that if something is not scrubbed, the test will be
      aborted, so that the data files will be preserved. Allow the tests to
      run on Windows as well.
      ffb38c97
    • Marko Mäkelä's avatar
      MDEV-11638 Encryption causes race conditions in InnoDB shutdown · 719321e7
      Marko Mäkelä authored
      InnoDB shutdown failed to properly take fil_crypt_thread() into account.
      The encryption threads were signalled to shut down together with other
      non-critical tasks. This could be much too early in case of slow shutdown,
      which could need minutes to complete the purge. Furthermore, InnoDB
      failed to wait for the fil_crypt_thread() to actually exit before
      proceeding to the final steps of shutdown, causing the race conditions.
      
      Furthermore, the log_scrub_thread() was shut down way too early.
      Also it should remain until the SRV_SHUTDOWN_FLUSH_PHASE.
      
      fil_crypt_threads_end(): Remove. This would cause the threads to
      be terminated way too early.
      
      srv_buf_dump_thread_active, srv_dict_stats_thread_active,
      lock_sys->timeout_thread_active, log_scrub_thread_active,
      srv_monitor_active, srv_error_monitor_active: Remove a race condition
      between startup and shutdown, by setting these in the startup thread
      that creates threads, not in each created thread. In this way, once the
      flag is cleared, it will remain cleared during shutdown.
      
      srv_n_fil_crypt_threads_started, fil_crypt_threads_event: Declare in
      global rather than static scope.
      
      log_scrub_event, srv_log_scrub_thread_active, log_scrub_thread():
      Declare in static rather than global scope. Let these be created by
      log_init() and freed by log_shutdown().
      
      rotate_thread_t::should_shutdown(): Do not shut down before the
      SRV_SHUTDOWN_FLUSH_PHASE.
      
      srv_any_background_threads_are_active(): Remove. These checks now
      exist in logs_empty_and_mark_files_at_shutdown().
      
      logs_empty_and_mark_files_at_shutdown(): Shut down the threads in
      the proper order. Keep fil_crypt_thread() and log_scrub_thread() alive
      until SRV_SHUTDOWN_FLUSH_PHASE, and check that they actually terminate.
      719321e7
    • Marko Mäkelä's avatar
      Part 1 of MDEV-8139 Fix scrubbing tests · 0f8e17af
      Marko Mäkelä authored
      Port a bug fix from MySQL 5.7, so that all undo log pages will be freed
      during a slow shutdown. We cannot scrub pages that are left allocated.
      
      commit 173e171c6fb55f064eea278c76fbb28e2b1c757b
      Author: Thirunarayanan Balathandayuthapani <thirunarayanan.balathandayuth@oracle.com>
      Date:   Fri Sep 9 18:01:27 2016 +0530
      
          Bug #24450908   UNDO LOG EXISTS AFTER SLOW SHUTDOWN
      
          Problem:
          ========
      
          1) cached undo segment is not removed from rollback segment history
          (RSEG_HISTORY) during slow shutdown. In other words, If the segment is
          not completely free, we are failing to remove an entry from the history
          list. While starting the server, we traverse all rollback segment slots
          history list and make it as list of undo logs to be purged in purge
          queue.
          In that case, purge queue will never be empty after slow shutdown.
      
          2) Freeing of undo log segment is linked with removing undo log header
          from history.
      
          Fix:
          ====
          1) Have separate logic of removing the undo log header from
          history list from rollback segment slots and remove it from
          rollback segment history even though it is not completely free.
      Reviewed-by: default avatarDebarun Banerjee <debarun.banerjee@oracle.com>
      Reviewed-by: default avatarMarko Mäkelä <marko.makela@oracle.com>
          RB:13672
      0f8e17af
    • Elena Stepanova's avatar
      MDEV-8518 rpl.sec_behind_master-5114 fails sporadically in buildbot · 9bf92706
      Elena Stepanova authored
      - fix the test to avoid false-negatives before MDEV-5114 patch;
      - fix the race condition which made the test fail on slow builders
      9bf92706
    • Oleksandr Byelkin's avatar
      MDEV-10035: DBUG_ASSERT on CREATE VIEW v1 AS SELECT * FROM t1 FOR UPDATE · bc4cac35
      Oleksandr Byelkin authored
      Ability to print lock type added.
      Restoring correct lock type for CREATE VIEW added.
      bc4cac35
    • Marko Mäkelä's avatar
      Merge 10.0 into 10.1 · 0c1de94d
      Marko Mäkelä authored
      0c1de94d
  9. 03 Jan, 2017 1 commit
    • Marko Mäkelä's avatar
      MDEV-11694 InnoDB tries to create unused table SYS_ZIP_DICT · 80d5d145
      Marko Mäkelä authored
      MariaDB Server 10.0.28 and 10.1.19 merged code from Percona XtraDB
      that introduced support for compressed columns. Much but not all
      of this code was disabled by placing #ifdef HAVE_PERCONA_COMPRESSED_COLUMNS
      around it.
      
      Among the unused but not disabled code is code to access
      some new system tables related to compressed columns.
      
      The creation of these system tables SYS_ZIP_DICT and SYS_ZIP_DICT_COLS
      would cause a crash in --innodb-read-only mode when upgrading
      from an earlier version to 10.0.28 or 10.1.19.
      
      Let us remove all the dead code related to compressed columns.
      Users who already upgraded to 10.0.28 and 10.1.19 will have the two
      above mentioned empty tables in their InnoDB system tablespace.
      Subsequent versions of MariaDB Server will completely ignore those tables.
      80d5d145