Details
-
Bug
-
Status: Closed (View Workflow)
-
Blocker
-
Resolution: Fixed
-
10.2.6
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
| Field | Original Value | New Value |
|---|---|---|
| Description |
Example:
{noformat} 2$ 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 {noformat} {noformat} $ 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) {noformat} {noformat} $ 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) {noformat} I don't know the extent of this problem -- how many files are affected, and to which point they have been reverted. |
Example:
{noformat} $ 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 {noformat} {noformat} $ 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) {noformat} {noformat} $ 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) {noformat} I don't know the extent of this problem -- how many files are affected, and to which point they have been reverted. |
| Assignee | Jan Lindström [ jplindst ] | Marko Mäkelä [ marko ] |
| Status | Open [ 1 ] | In Progress [ 3 ] |
bb-10.2-marko
You may want to compare this to what was changed in 10.1:
git checkout bb-10.2-marko
|
git pull
|
diff -I^@@ <(git diff mariadb-10.2.5..15110231d9773af68b0a6c34308bbf7d6d4ec49d mysql-test/suite/encryption/) <(git diff 765a43605a42c069ede604826ede2d93d72c4fdd{~,} mysql-test/suite/encryption)
|
It is a huge diff, 1534 lines. On the other hand, the diff will be 2898 lines if the above patch is not applied:
diff -I^@@ <(git diff mariadb-10.2.5..15110231d9773af68b0a6c34308bbf7d6d4ec49d~ mysql-test/suite/encryption/) <(git diff 765a43605a42c069ede604826ede2d93d72c4fdd{~,} mysql-test/suite/encryption)
|
| Assignee | Marko Mäkelä [ marko ] | Elena Stepanova [ elenst ] |
| Status | In Progress [ 3 ] | In Review [ 10002 ] |
| issue.field.resolutiondate | 2017-05-10 06:13:57.0 | 2017-05-10 06:13:57.997 |
| Component/s | Tests [ 10800 ] | |
| Fix Version/s | 10.2.6 [ 22527 ] | |
| Fix Version/s | 10.2 [ 14601 ] | |
| Resolution | Fixed [ 1 ] | |
| Status | In Review [ 10002 ] | Closed [ 6 ] |
| Affects Version/s | 10.2.6 [ 22527 ] | |
| Affects Version/s | 10.2 [ 14601 ] |
| Assignee | Elena Stepanova [ elenst ] | Marko Mäkelä [ marko ] |
| Workflow | MariaDB v3 [ 80696 ] | MariaDB v4 [ 152133 ] |
The culprit appears to be my merge of MDEV-12253 from 10.1 to 10.2, as you can see by
git diff f9cc391863ab962e8c8a8a8a676d730498eb8d6f{~,} mysql-test/suite/encryptionIn that merge, I resolved all other conflicts manually, except for mysql-test/suite/encryption I initially did the following to pick up changes that were supposedly already merged by Jan Lindström:
git checkout origin/bb-10.2-MDEV-12253 mysql-test/suite/encryptionApparently some of the conflict resolution in bb-10.2-MDEV-12253 consisted of copying files directly from 10.1.
I will redo the merge, resolve the conflicts manually and ensure that 10.2 is not using have_xtradb.inc, and finally push the adjustments to 10.2.
In 10.1 we probably should not use have_xtradb.inc either.