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

[PATCH] MTR/mysqltest overlays for included files do not work on Windows

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Closed (View Workflow)
    • Priority: Minor
    • Resolution: Fixed
    • Affects Version/s: 10.0.5, 5.5.33a
    • Fix Version/s: 5.5.34, 10.0.6
    • Component/s: None
    • Labels:

      Description

      Lets say we have a suite foo, which has a test bar.test, which calls source qux.inc.
      An engine X has an overlay for the suite foo. The test bar.test there remains the same, but the file qux.inc is overridden.

      On Linux, it works as expected, when foo-X.bar is executed, the file basedir/X/mysql-test/foo/qux.inc is used in the source command. But on Windows it is not so – basedir/mysql-test/suite/foo/qux.inc is still called.

      I got it work by this change: http://bazaar.launchpad.net/~elenst/maria/5.5-elenst-overlays/revision/3945 , but I'm not 100% sure it's the right and complete fix.

      In the revision above, only a change in mysqltest.cc is the fix, the rest is a test case for the problem.

      It modifies mtr2.single test so that it calls overlay.inc, and introduces overlay.inc files in the base mtr2 suite and in the MyISAM overlay for it. It also adds single.rdiff file for MyISAM.

      So, the expected result is when the base suite is executed, it calls the base overlay.inc which executes select 2, which matches the result file. When the MyISAM overlay is executed, it should call its own overlay.inc which executes select 3, which matches the rdiff file.

      On Windows, without the fix the test fails:

      --- C:/buildbot/win-rqg-se/5.5-elenst-overlays/storage/myisam/mysql-test/mtr2/single.result~    2013-11-10 08:31:39.9444
      66600 -0800
      +++ C:\buildbot\win-rqg-se\5.5-elenst-overlays\storage\myisam\mysql-test\mtr2\single.reject     2013-11-10 09:06:53.5765
      79000 -0800
      @@ -1,6 +1,6 @@
       select 1;
       1
       1
      -select 3;
      -3
      -3
      +select 2;
      +2
      +2

      Which shows that the included file is wrong (but rdiff is picked up all right).

        Attachments

          Activity

            People

            Assignee:
            elenst Elena Stepanova
            Reporter:
            elenst Elena Stepanova
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Dates

              Created:
              Updated:
              Resolved: