Uploaded image for project: 'MariaDB Server'
  1. MariaDB Server
  2. MDEV-12762

Some files in current 10.2 tree seem to be reverted to an old state

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Closed (View Workflow)
    • Priority: Blocker
    • Resolution: Fixed
    • Affects Version/s: 10.2.6
    • Fix Version/s: 10.2.6
    • Component/s: Tests
    • Labels:

      Description

      Example:

      $ git log -1
      commit eb2b7ff6230286cc3e1d73410cdedda12cee3747
      Author: Sergei Golubchik <serg@mariadb.org>
      Date:   Tue May 9 18:32:36 2017 +0200
       
          update C/C
       
      $ git diff mariadb-10.2.5 mysql-test/suite/encryption/t/filekeys_badtest.inc
      diff --git a/mysql-test/suite/encryption/t/filekeys_badtest.inc b/mysql-test/suite/encryption/t/filekeys_badtest.inc
      index 60ac9f0..7c0858a 100644
      --- a/mysql-test/suite/encryption/t/filekeys_badtest.inc
      +++ b/mysql-test/suite/encryption/t/filekeys_badtest.inc
      @@ -1,5 +1,5 @@
       -- source include/not_embedded.inc
      --- source include/have_innodb.inc
      +-- source include/have_xtradb.inc
       -- source filekeys_plugin.inc
       
       --eval call mtr.add_suppression("$SEARCH_PATTERN")
      @@ -7,6 +7,7 @@ call mtr.add_suppression("Plugin 'file_key_management' init function returned er
       call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
       
       --let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err
      +--let SEARCH_RANGE= -10000
       --source include/search_pattern_in_file.inc
       
       --error ER_CANT_CREATE_TABLE
      

      $ git log mysql-test/suite/encryption/t/filekeys_badtest.inc 
      commit ab8415d9835c750e7b9c71595744c95d4426d591
      Author: Sergei Golubchik <serg@mariadb.org>
      Date:   Sat May 9 12:31:53 2015 +0200
       
          move encryption tests to a dedicate suite
          
          remove few tests for variables that never existed (merge error)
      

      $ git log mariadb-10.2.5 mysql-test/suite/encryption/t/filekeys_badtest.inc 
      commit b2865a437f45922c2f31f2bffe0f7d6134a8720e
      Author: Sergei Golubchik <serg@mariadb.org>
      Date:   Tue Mar 14 15:36:30 2017 +0100
       
          search_pattern_in_file.inc changes
          
          1. Special mode to search in error logs: if SEARCH_RANGE is not set,
             the file is considered an error log and the search is performed
             since the last CURRENT_TEST: line
          2. Number of matches is printed too. "FOUND 5 /foo/ in bar".
             Use greedy .* at the end of the pattern if number of matches
             isn't stable. If nothing is found it's still "NOT FOUND",
             not "FOUND 0".
          3. SEARCH_ABORT specifies the prefix of the output.
             Can be "NOT FOUND" or "FOUND" as before,
             but also "FOUND 5 " if needed.
       
      commit ab89359dde2f8fce2f1b7d233587804f459b9348
      Author: Sergei Golubchik <serg@mariadb.org>
      Date:   Tue Dec 27 19:40:07 2016 +0100
       
          enable tests that were skipped because of have_xtradb
          
          * some of these tests run just fine with InnoDB:
             -> s/have_xtradb/have_innodb/
          * sys_var tests did basic tests for xtradb only variables
             -> remove them, they're useless anyway (sysvar_innodb does it better)
          * multi_update had innodb specific tests
             -> move to multi_update_innodb.test
       
      commit ab8415d9835c750e7b9c71595744c95d4426d591
      Author: Sergei Golubchik <serg@mariadb.org>
      Date:   Sat May 9 12:31:53 2015 +0200
       
          move encryption tests to a dedicate suite
          
          remove few tests for variables that never existed (merge error)
      

      I don't know the extent of this problem – how many files are affected, and to which point they have been reverted.

        Attachments

          Activity

            People

            Assignee:
            marko Marko Mäkelä
            Reporter:
            elenst Elena Stepanova
            Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

              Dates

              Created:
              Updated:
              Resolved: