1. 12 Jan, 2017 1 commit
    • Marko Mäkelä's avatar
      Improve an MDEV-9011 test of innodb_encrypt_log. · 2dc5d8bb
      Marko Mäkelä authored
      Test crash recovery from an encrypted redo log with innodb_encrypt_log=0.
      Previously, we did a clean shutdown, so only the log checkpoint
      information would have been read from the redo log. With this change,
      we will be reading and applying encrypted redo log records.
      
      include/start_mysqld.inc: Observe $restart_parameters.
      
      encryption.innodb-log-encrypt: Remove some unnecessary statements,
      and instead of restarting the server and concurrently accessing
      the files while the server is running, kill the server, check the
      files, and finally start up the server.
      
      innodb.log_data_file_size: Use start_mysqld.inc with $restart_parameters.
      2dc5d8bb
  2. 11 Jan, 2017 4 commits
  3. 10 Jan, 2017 2 commits
    • 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
  4. 09 Jan, 2017 3 commits
  5. 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
  6. 07 Jan, 2017 1 commit
  7. 06 Jan, 2017 5 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
    • 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
  8. 05 Jan, 2017 6 commits
  9. 04 Jan, 2017 6 commits
    • 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
  10. 03 Jan, 2017 5 commits
    • 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
    • Marko Mäkelä's avatar
      Post-fix for MDEV-11688 fil_crypt_threads_end() tries to create threads · ba8198a3
      Marko Mäkelä authored
      fil_crypt_threads_cleanup(): Do nothing if nothing was initialized.
      ba8198a3
    • Marko Mäkelä's avatar
      MDEV-11688 fil_crypt_threads_end() tries to create threads · fc779252
      Marko Mäkelä authored
      after aborted InnoDB startup
      
      This bug was repeatable by starting MariaDB 10.2 with an
      invalid option, such as --innodb-flush-method=foo.
      It is not repeatable in MariaDB 10.1 in the same way, but the
      problem exists already there.
      fc779252
    • Sachin Setiya's avatar
      MDEV-7955 WSREP() appears on radar in OLTP RO · b4616c40
      Sachin Setiya authored
      This commit is for optimizing WSREP(thd) macro.
      
      #define WSREP(thd) \
        (WSREP_ON && wsrep && (thd && thd->variables.wsrep_on))
      
      In this we can safely remove wsrep and thd. We are not removing WSREP_ON
      because this will change WSREP(thd) behaviour.
      
      Patch Credit:- Nirbhay Choubay, Sergey Vojtovich
      b4616c40
    • Sachin Setiya's avatar
      MDEV-11016 wsrep_node_is_ready() check is too strict · d9a1a201
      Sachin Setiya authored
      Problem:-
        The condition that checks for node readiness is too strict as it does
        not allow SELECTs even if these selects do not access any tables.
          For example,if we run
             SELECT 1;
          OR
             SELECT @@max_allowed_packet;
      Solution:-
        We need not to report this error when all_tables(lex->query_tables)
        is NULL:
      d9a1a201
  11. 01 Jan, 2017 3 commits
    • Elena Stepanova's avatar
      MDEV-10100 main.pool_of_threads fails sporadically in buildbot · 3871477c
      Elena Stepanova authored
      The patch fixes two test failures:
      - on slow builders, sometimes a connection attempt which should
        fail due to the exceeded number of thread_pool_max_threads
        actually succeeds;
      - on even slow builders, MTR sometimes cannot establish the
        initial connection, and check-testcase fails prior to the
        test start
      
      The problem with check-testcase was caused by connect-timeout=2
      which was set for all clients in the test config file. On slow
      builders it might be not enough.
      There is no way to override it for the pre-test check, so it needed
      to be substantially increased or removed.
      
      The other problem was caused by a race condition between sleeps
      that the test performs in existing connections and the connect
      timeout for the connection attempt which was expected to fail.
      If sleeps finished before the connect-timeout was exceeded, it
      would allow the connection to succeed.
      
      To solve each problem without making the other one worse,
      connect-timeout should be configured dynamically during the test.
      Due to the nature of the test (all connections must be busy
      at the moment when we need to change the timeout, and cannot execute
      SET GLOBAL ...), it needs to be done independently from the server.
      
      The solution:
      - recognize 'connect_timeout' as a connection option in mysqltest's
        "connect" command;
      - remove connect-timeout from the test configuration file;
      - use the new connect_timeout option for those connections which
        are expected to fail;
      - re-arrange the test flow to allow running a huge SLEEP
        without affecting the test execution time (because it would be
        interrupted after the main test flow is finished).
      
      The test is still subject to false negatives, e.g. if the connection
      fails due to timeout rather than due to the exceeded number of
      allowed threads, or if the connection on extra port succeeds due
      to a race condition and not because the special logic for the extra
      port. But those false negatives have always been possible there
      on slow builders, they should not be critical because faster builders
      should catch such failures if they appear.
      3871477c
    • Sachin Setiya's avatar
      MDEV-11636 Extra persistent columns on slave always gets NULL in RBR · d02a77bc
      Sachin Setiya authored
      Problem:- In replication if slave has extra persistent column then these
      column are not computed while applying write-set from master.
      
      Solution:- While applying row events from server, we will generate values
      for extra persistent columns.
      d02a77bc
    • Sachin Setiya's avatar
      MDEV-11636 Extra persistent columns on slave always gets NULL in RBR · 2f5670dc
      Sachin Setiya authored
      Problem:- In replication if slave has extra persistent column then these
      column are not computed while applying write-set from master.
      
      Solution:- While applying row events from server, we will generate values
      for extra persistent columns.
      2f5670dc
  12. 30 Dec, 2016 2 commits
    • Marko Mäkelä's avatar
      MDEV-11556 InnoDB redo log apply fails to adjust data file sizes · 8451e090
      Marko Mäkelä authored
      fil_space_t::recv_size: New member: recovered tablespace size in pages;
      0 if no size change was read from the redo log,
      or if the size change was implemented.
      
      fil_space_set_recv_size(): New function for setting space->recv_size.
      
      innodb_data_file_size_debug: A debug parameter for setting the system
      tablespace size in recovery even when the redo log does not contain
      any size changes. It is hard to write a small test case that would
      cause the system tablespace to be extended at the critical moment.
      
      recv_parse_log_rec(): Note those tablespaces whose size is being changed
      by the redo log, by invoking fil_space_set_recv_size().
      
      innobase_init(): Correct an error message, and do not require a larger
      innodb_buffer_pool_size when starting up with a smaller innodb_page_size.
      
      innobase_start_or_create_for_mysql(): Allow startup with any initial
      size of the ibdata1 file if the autoextend attribute is set. Require
      the minimum size of fixed-size system tablespaces to be 640 pages,
      not 10 megabytes. Implement innodb_data_file_size_debug.
      
      open_or_create_data_files(): Round the system tablespace size down
      to pages, not to full megabytes, (Our test truncates the system
      tablespace to more than 800 pages with innodb_page_size=4k.
      InnoDB should not imagine that it was truncated to 768 pages
      and then overwrite good pages in the tablespace.)
      
      fil_flush_low(): Refactored from fil_flush().
      
      fil_space_extend_must_retry(): Refactored from
      fil_extend_space_to_desired_size().
      
      fil_mutex_enter_and_prepare_for_io(): Extend the tablespace if
      fil_space_set_recv_size() was called.
      
      The test case has been successfully run with all the
      innodb_page_size values 4k, 8k, 16k, 32k, 64k.
      8451e090
    • Marko Mäkelä's avatar
      f493e395
  13. 28 Dec, 2016 1 commit