1. 01 Aug, 2018 2 commits
    • Marko Mäkelä's avatar
      MDEV-16865 InnoDB fts_query() ignores KILL · a7f84f09
      Marko Mäkelä authored
      The functions fts_ast_visit() and fts_query() inside
      InnoDB FULLTEXT INDEX query processing are not checking
      for THD::killed (trx_is_interrupted()), like anything
      that potentially takes a long time should do.
      
      This is a port of the following change from MySQL 5.7.23,
      with a completely rewritten test case.
      
      commit c58c6f8f66ddd0357ecd0c99646aa6bf1dae49c8
      Author: Aakanksha Verma <aakanksha.verma@oracle.com>
      Date:   Fri May 4 15:53:13 2018 +0530
      
      Bug #27155294 MAX_EXECUTION_TIME NOT INTERUPTED WITH FULLTEXT SEARCH USING MECAB
      a7f84f09
    • Marko Mäkelä's avatar
      Fix function pointer type mismatch · b3e95086
      Marko Mäkelä authored
      b3e95086
  2. 31 Jul, 2018 1 commit
  3. 30 Jul, 2018 10 commits
    • Marko Mäkelä's avatar
      MDEV-16855 Fix fts_sync_synchronization in InnoDB · e52315a4
      Marko Mäkelä authored
      This is a backport of the following fix from MySQL 5.7.23.
      Some code refactoring has been omitted, and the test case has
      been adapted to MariaDB.
      
      commit 7a689acaa65e9d602575f7aa53fe36a64a07460f
      Author: Krzysztof Kapuścik <krzysztof.kapuscik@oracle.com>
      Date:   Tue Mar 13 12:34:03 2018 +0100
      
      Bug#27082268 Invalid FTS sync synchronization
      
      The fix closes two issues:
      Bug #27082268 - INNODB: FAILING ASSERTION: SYM_NODE->TABLE != NULL DURING FTS SYNC
      Bug #27095935 - DEADLOCK BETWEEN FTS_DROP_INDEX AND FTS_OPTIMIZE_SYNC_TABLE
      
      Both issues were related to a FTS cache sync being done during
      operations that perfomed DDL actions on internal FTS tables
      (ALTER TABLE, TRUNCATE). In some cases the FTS tables and/or
      internal cache structures could get removed while still being
      used to perform FTS synchronization leading to crashes. In other
      the sync operations could not get finishes as it was waiting for
      dict lock which was taken by thread waiting for the background
      sync to be finished.
      
      The changes done includes:
      - Stopping background operations during ALTER TABLE and TRUNCATE.
      - Removal of unused code in FTS.
      - Cleanup of FTS sync related code to make it more readable and
      easier to maintain.
      
      RB#18262
      e52315a4
    • Marko Mäkelä's avatar
      Apply the 5.6.40 security fixes to XtraDB · 5ed2da95
      Marko Mäkelä authored
      We did not merge Percona XtraDB 5.6.40-84.0 yet.
      The changes in it are mostly cosmetic, except for
      2 bug fixes from Oracle MySQL 5.6.40, which could
      be security bugs.
      
      This was achieved by taking the applicable parts
      of an earlier InnoDB commit to XtraDB:
      
      git diff 15ec8c2f{~,} storage/innobase|
      sed -e s+/innobase/+/xtradb/+|patch -p1
      5ed2da95
    • Marko Mäkelä's avatar
      Merge 5.5 into 10.0 · 7c773abd
      Marko Mäkelä authored
      7c773abd
    • Karthik Kamath's avatar
      No commit message · a49ec980
      Karthik Kamath authored
      No commit message
      a49ec980
    • Marko Mäkelä's avatar
      Merge InnoDB MySQL 5.6.41 to 10.0 · 4c21c367
      Marko Mäkelä authored
      4c21c367
    • Sachin Agarwal's avatar
      Bug #27326796 - MYSQL CRASH WITH INNODB ASSERTION FAILURE IN FILE PARS0PARS.CC · 29ddc6e9
      Sachin Agarwal authored
      Problem:
      As part of bug #24938374 fix, dict_operation_lock was not taken by
      fts_optimize_thread while syncing fts cache.
      Due to this change, alter query is able to update SYS_TABLE rows
      simultaneously. Now when fts_optimizer_thread goes open index table,
      It doesn't open index table if the record corresponding to that table is
      set to REC_INFO_DELETED_FLAG in SYS_TABLES and hits an assert.
      
      Fix:
      If fts sync is already in progress, Alter query would wait for sync to
      complete before renaming table.
      
      RB: #19604
      Reviewed by : Jimmy.Yang@oracle.com
      29ddc6e9
    • Marko Mäkelä's avatar
      Merge 5.5 into 10.0 · 91181b22
      Marko Mäkelä authored
      91181b22
    • Marko Mäkelä's avatar
      Fix InnoDB/XtraDB warnings by GCC 8.2.0 · d17e9a02
      Marko Mäkelä authored
      d17e9a02
    • Marko Mäkelä's avatar
      MDEV-16851 On schema mismatch in IMPORT TABLESPACE, display ROW_FORMAT in clear text · 8bdd1250
      Marko Mäkelä authored
      This is motivated by Oracle MySQL Bug #27542720 SCHEMA MISMATCH
      - TABLE FLAGS DON'T MATCH, BUT FLAGS ARE NUMBERS
      but using a different approach.
      
      row_import::match_schema(): In case of a mismatch, display the
      ROW_FORMAT and optionally KEY_BLOCK_SIZE of the .cfg file.
      8bdd1250
    • Marko Mäkelä's avatar
      Use a more precise argument for memset() · 34096335
      Marko Mäkelä authored
      34096335
  4. 29 Jul, 2018 1 commit
    • Oleksandr Byelkin's avatar
      Merge remote-tracking branch 'mysql/5.5' into 5.5 · fceda2da
      Oleksandr Byelkin authored
      We do not accept:
      1. We did not have this problem (fixed earlier and better)
       d982e717 Bug#27510150: MYSQLDUMP FAILS FOR SPECIFIC --WHERE CLAUSES
      2. We do not have such options (an DBUG_ASSERT put just in case)
       bbc2e37f Bug#27759871: BACKRONYM ISSUE IS STILL IN MYSQL 5.7
      3. Serg fixed it in other way in this release:
       e48d775c Bug#27980823: HEAP OVERFLOW VULNERABILITIES IN MYSQL CLIENT LIBRARY
      fceda2da
  5. 27 Jul, 2018 1 commit
  6. 25 Jul, 2018 4 commits
    • Varun Gupta's avatar
      MDEV-15454: Nested SELECT IN returns wrong results · 37dee22d
      Varun Gupta authored
      In this case we are setting the field Item_func_eq::in_eqaulity_no for the semi-join equalities.
      This helps us to remove these equalites as the inner tables are not available during parent select execution
      while the outer tables are not available during materialization phase.
      We only have it set for the equalites for the fields involved with the IN subquery
      and reset it for the equalities which do not belong to the IN subquery.
      
      For example in case of nested IN subqueries:
      
          SELECT t1.a FROM t1 WHERE t1.a IN
            (SELECT t2.a FROM t2 where t2.b IN
                (select t3.b from t3 where t3.c=27 ))
      
      there are two equalites involving the fields of the IN subquery
      
      1) t2.b = t3.b :  the field Item_func_eq::in_eqaulity_no is set when we merge the grandchild select into the child select
      2) t1.a = t2.a :  the field Item_func_eq::in_eqaulity_no is set when we merge the child select into the parent select
      
      But when we perform case 2) we should ensure that we reset the equalities in the child's WHERE clause.
      37dee22d
    • Varun Gupta's avatar
      MDEV-16751: Server crashes in st_join_table::cleanup or... · f9b43c25
      Varun Gupta authored
      MDEV-16751: Server crashes in st_join_table::cleanup or TABLE_LIST::is_with_table_recursive_reference
                  with join_cache_level>2
      
      During muliple equality propagation for a query in which we have an IN subquery, the items in the select list of the
      subquery may not be part of the multiple equality because there might be another occurence of the same field in the
      where clause of the subquery.
      So we keyuse_is_valid_for_access_in_chosen_plan function which expects the items in the select list of the subquery to
      be same to the ones in the multiple equality (through these multiple equalities we create keyuse array).
      The solution would be that we expect the same field not the same Item because when we have SEMI JOIN MATERIALIZATION SCAN,
      we use copy back technique to copies back the materialised table fields to the original fields of the base tables.
      f9b43c25
    • Igor Babaev's avatar
      MDEV-16820 Lost 'Impossible where' from query with inexpensive subquery · c6310607
      Igor Babaev authored
      This patch fixes another problem introduced by the patch for mdev-4817.
      The latter changed Item_cond::fix_fields() in such a way that it could
      call the virtual method is_expensive(). With the first its call
      the method saves the result in Item::is_expensive_cache. For all next
      calls the method returns the result from this cache. So if the item
      once was determined as expensive the method always returns true.
      For subqueries it's not good, because non-optimized subqueries always
      is considered as expensive.
      It means that the cache should be invalidated after the call of
      optimize_constant_subqueries().
      c6310607
    • Igor Babaev's avatar
      MDEV-16820 Lost 'Impossible where' from query with inexpensive subquery · d567f161
      Igor Babaev authored
      This patch fixes another problem introduced by the patch for mdev-4817.
      The latter changed Item_cond::fix_fields() in such a way that it could
      call the virtual method is_expensive(). With the first its call
      the method saves the result in Item::is_expensive_cache. For all next
      calls the method returns the result from this cache. So if the item
      once was determined as expensive the method always returns true.
      For subqueries it's not good, because non-optimized subqueries always
      is considered as expensive.
      It means that the cache should be invalidated after the call of
      optimize_constant_subqueries().
      d567f161
  7. 24 Jul, 2018 4 commits
  8. 23 Jul, 2018 1 commit
  9. 19 Jul, 2018 9 commits
    • Igor Babaev's avatar
      MDEV-16726 Assertion `tab->type == JT_REF || tab->type == JT_EQ_REF' failed · 9cea4ccf
      Igor Babaev authored
      Due to a legacy bug in the code of make_join_statistics() detecting
      so-called constant tables could miss some of them in rare queries
      that used RIGHT JOIN. As a result these queries had execution plans
      different from the execution plans of the equivalent queries with
      LEFT JOIN.
      Besides starting from 10.2 this could trigger an assertion failure.
      9cea4ccf
    • Sergei Golubchik's avatar
      MDEV-15551 Server hangs or assertion `strcmp(share->unique_file_name,filename)... · d57ddaa1
      Sergei Golubchik authored
      MDEV-15551 Server hangs or assertion `strcmp(share->unique_file_name,filename) || share->last_version' fails in test_if_reopen or unexpected ER_LOCK_DEADLOCK
      
      only use HA_EXTRA_PREPARE_FOR_DROP when the table is going to be dropped
      d57ddaa1
    • Sergei Golubchik's avatar
      MDEV-14882 mysql_upgrade performs unnecessary conversions back and forth · 5c744bb5
      Sergei Golubchik authored
      avoid round-robin conversions, if the column is MODIFY-ed,
      it should always be modified to its final definition, not to some
      intermediate state.
      
      also avoid other unconditional changes, like
        ALTER TABLE event DROP PRIMARY KEY;
        ALTER TABLE event ADD PRIMARY KEY(db, name);
      5c744bb5
    • Sergei Golubchik's avatar
      MDEV-13397 MariaDB upgrade fail when using default_time_zone · 40f29ecb
      Sergei Golubchik authored
      don't try to set default time zone in --bootstrap,
      this generally cannot be done, as timezone tables aren't loaded.
      and bootstrap scripts don't need it anyway.
      40f29ecb
    • Sergei Golubchik's avatar
      MDEV-11790 WITHOUT_SERVER installs mysqld_safe_helper · 33eccb57
      Sergei Golubchik authored
      Don't install server files if WITHOUT_SERVER is specified.
      "Server files" are defined as files going into the MariaDB-Server RPM,
      that is files in the components Server, ManPagesServer, Server_Scripts,
      IniFiles, SuportFiles, and Readme.
      33eccb57
    • Sergei Golubchik's avatar
      MDEV-11741 handler::ha_reset(): Assertion... · bd5cf02b
      Sergei Golubchik authored
      MDEV-11741 handler::ha_reset(): Assertion `bitmap_is_set_all(&table->s->all_set)' failed or server crash in mi_reset or buffer overrun or unexpected ER_CANT_REMOVE_ALL_FIELDS
      
      MEMORY table could be renamed into a non-extistent database.
      
      rename() is documented to return ENOENT when the source file does not
      exist OR when the target directory not exist. Nonexistent source .frm
      file is ok (table can still exist in the engine), nonexistent target
      directory is not.
      
      Make my_rename to use ENOTDIR for the latter case. Make RENAME TABLE
      issue an appropriate error ("unknown database" instead of "unknown table")
      bd5cf02b
    • Sergei Golubchik's avatar
      MDEV-8941 Compile on Solaris (SPARC) fails with errors in filamvct.cpp · 0b3e28a4
      Sergei Golubchik authored
      remove unnecessary declaration
      0b3e28a4
    • Alexander Barkov's avatar
      Simplify caseup() and casedn() in charsets · e2ac4098
      Alexander Barkov authored
      After the MDEV-13118 fix there's no code in the server that
      wants caseup/casedn to change the argument in place for simple
      charsets.  Let's remove this logic and always return the result in a
      new string for all charsets, both simple and complex.
      
      1. Removing the optimization that *some* character sets used in casedn()
        and caseup(), which allowed (and required) to change the case in-place,
        overwriting the string passed as the "src" argument.
        Now all CHARSET_INFO's work in the same way:
        non of them change the source string in-place, all of them now convert
        case from the source string to the destination string, leaving
        the source string untouched.
      
      2. Adding "const" qualifier to the "char *src" parameter
         to caseup() and casedn().
      
      3. Removing duplicate implementations in ctype-mb.c.
        Now both caseup() and casedn() implementations for all CJK character sets
        use internally the same function my_casefold_mb()
        (the former my_casefold_mb_varlen()).
      
      4. Removing the "unused" attribute from parameters of some my_case{up|dn}_xxx()
         implementations, as the affected parameters are now *used* in the code.
         Previously these parameters were used only in DBUG_ASSERT().
      e2ac4098
    • Alexander Barkov's avatar
      MDEV-13118 Wrong results with LOWER and UPPER and subquery · ab58493d
      Alexander Barkov authored
      This problem is similar to MDEV-10306.
      
      1. Fixing Item_str_conv::val_str(String *str) to return the result in "str",
         and to use tmp_value only as a temporary buffer for args[0]->val_str().
         The new code version now guarantees that the result is always returned in
         "str". The trick with copy_if_not_alloced() is not used any more.
      
      2. The change #1 revealed the same problem in SUBSTRING_INDEX(),
         so some tests with combinations of UPPER()/LOWER() and SUBSTRING_INDEX()
         started to fail. Fixing Item_func_substr_index::val_str() the same way,
         to return the result in "str" and use tmp_value as a temporary buffer
         for args[0]->val_str().
      ab58493d
  10. 18 Jul, 2018 1 commit
    • sachin's avatar
      MDEV-9266 Creating index on temporaray table breaks replication · ada54101
      sachin authored
      Problem:- Create/drop index was logged into binlog.
      
      Goal:- Operation on temporary table should not be binlog when binlog format
      is row.
      
      Solution:-
      We should add CF_FORCE_ORIGINAL_BINLOG_FORMAT when there is ddl on temp
      table.
      For optimize, analyze, repair we wont change anything ,Then will
      be logged in binlog , But they also dont throw any error if operation fails
      Since slave wont be having any temp table , but these operation on tmp
      table will be processed without breaking replication.
      
      For rename we need a different logic MDEV-16728 will solve it.
      ada54101
  11. 17 Jul, 2018 1 commit
  12. 16 Jul, 2018 1 commit
  13. 14 Jul, 2018 2 commits
    • Igor Babaev's avatar
      MDEV-16760 CREATE OR REPLACE TABLE never updates statistical tables · 1fd84f91
      Igor Babaev authored
      If the command CREATE OR REPLACE TABLE really replaces a table then
      it should remove all data on this table from all statistical tables.
      1fd84f91
    • Igor Babaev's avatar
      MDEV-16757 Memory leak after adding manually min/max statistical data · c89bb15c
      Igor Babaev authored
                 for blob column
      
      ANALYZE TABLE <table> does not collect statistical data on min/max values
      for BLOB columns of <table>. However these values can be added into
      mysql.column_stats manually by executing proper statements.
      Unfortunately this led to a memory leak because the memory allocated
      for these values was never freed.
      This patch provides the server with a function to free memory allocated
      for min/max statistical values of BLOB types.
      c89bb15c
  14. 11 Jul, 2018 2 commits