[gentoo-commits] proj/mysql-extras:master commit in: /

[Brian Evans]

commit:     15411faa29239bfb13a6f6760afd331663d4899e
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 18:49:20 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jul 29 18:49:20 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=15411faa

Fix deprecated perl array defined syntax for test suite in 5.5

 00000_index.txt                                |  6 ++++++
 20019_all_mysql-5.5-mtr-perl-deprecation.patch | 24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/00000_index.txt b/00000_index.txt
index 64dbfb3..ac9894a 100644
--- a/00000_index.txt
+++ b/00000_index.txt
@@ -1942,3 +1942,9 @@
 @ver 5.06.25.00 to 5.06.99.99
 @pn percona-server
 @@ Split building of client libraries, server and client tools
+
+@patch 20019_all_mysql-5.5-mtr-perl-deprecation.patch
+@ver 5.05.45.00 to 5.05.99.99
+@pn mysql
+@@ Fix deprecated perl array defined syntax on mtr test script
+@@ Ported forward from mysql 5.6; Oracle bug 18145121

diff --git a/20019_all_mysql-5.5-mtr-perl-deprecation.patch b/20019_all_mysql-5.5-mtr-perl-deprecation.patch
new file mode 100644
index 0000000..de8434c
--- /dev/null
+++ b/20019_all_mysql-5.5-mtr-perl-deprecation.patch
@@ -0,0 +1,24 @@
+diff -aurN a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
+--- a/mysql-test/lib/mtr_cases.pm	2015-06-25 09:44:36.000000000 -0400
++++ b/mysql-test/lib/mtr_cases.pm	2015-07-29 14:44:05.964091000 -0400
+@@ -336,7 +336,7 @@
+   # Build a hash of disabled testcases for this suite
+   # ----------------------------------------------------------------------
+   my %disabled;
+-  my @disabled_collection= @{$opt_skip_test_list} if defined @{$opt_skip_test_list};
++  my @disabled_collection= @{$opt_skip_test_list} if $opt_skip_test_list;
+   unshift (@disabled_collection, "$testdir/disabled.def");
+   for my $skip (@disabled_collection)
+     {
+diff -aurN a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
+--- a/mysql-test/mysql-test-run.pl	2015-06-25 09:44:36.000000000 -0400
++++ b/mysql-test/mysql-test-run.pl	2015-07-29 14:34:54.796091000 -0400
+@@ -490,7 +490,7 @@
+     }
+   }
+ 
+-  if ( not defined @$completed ) {
++  if ( not @$completed ) {
+     mtr_error("Test suite aborted");
+   }
+