Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~laurynas-biveinis/percona-server/bug1180481 into lp:percona-server/5.6

  1. bug1180481
  2. Merge into 5.6
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 347
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1180481
Merge into: lp:percona-server/5.6
Diff against target: 107 lines (+18/-0)
18 files modified
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_hash_innodb-master.opt (+1/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_hash_myisam-master.opt (+1/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_inv_innodb-master.opt (+1/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_inv_myisam-master.opt (+1/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_key_innodb-master.opt (+1/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_key_myisam-master.opt (+1/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_list_innodb-master.opt (+1/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_list_myisam-master.opt (+1/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_range_innodb-master.opt (+1/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_parts_range_myisam-master.opt (+1/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_list_innodb-master.opt (+1/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_list_myisam-master.opt (+1/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_range_innodb-master.opt (+1/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_range_myisam-master.opt (+1/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_list_innodb-master.opt (+1/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_list_myisam-master.opt (+1/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_range_innodb-master.opt (+1/-0)
Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_range_myisam-master.opt (+1/-0)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug1180481
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+164092@code.launchpad.net

Description of the change

Makes working with 5.6 param jobs slightly less painful.
http://jenkins.percona.com/job/percona-server-5.6-param/104/ at least one slave completed confirming the fix.

Fix bug 1180481 / http://bugs.mysql.com/bug.php?id=69252
(parts.partition_max* testcases are incompatible with --parallel)

The testcases fail because server secure-file-priv setting is
incompatible with $MYSQL_TMP_DIR path if --parallel is used to run
MTR.

Fix the testcases to do the same as all the other testcase that need
secure-file-priv pointing to $MYSQL_TMP_DIR do: add -master.opt files
explicitly allowing it.

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'Percona-Server/mysql-test/suite/parts/t/partition_max_parts_hash_innodb-master.opt'
2--- Percona-Server/mysql-test/suite/parts/t/partition_max_parts_hash_innodb-master.opt 1970-01-01 00:00:00 +0000
3+++ Percona-Server/mysql-test/suite/parts/t/partition_max_parts_hash_innodb-master.opt 2013-05-16 08:48:40 +0000
4@@ -0,0 +1,1 @@
5+--secure-file-priv=$MYSQL_TMP_DIR
6
7=== added file 'Percona-Server/mysql-test/suite/parts/t/partition_max_parts_hash_myisam-master.opt'
8--- Percona-Server/mysql-test/suite/parts/t/partition_max_parts_hash_myisam-master.opt 1970-01-01 00:00:00 +0000
9+++ Percona-Server/mysql-test/suite/parts/t/partition_max_parts_hash_myisam-master.opt 2013-05-16 08:48:40 +0000
10@@ -0,0 +1,1 @@
11+--secure-file-priv=$MYSQL_TMP_DIR
12
13=== added file 'Percona-Server/mysql-test/suite/parts/t/partition_max_parts_inv_innodb-master.opt'
14--- Percona-Server/mysql-test/suite/parts/t/partition_max_parts_inv_innodb-master.opt 1970-01-01 00:00:00 +0000
15+++ Percona-Server/mysql-test/suite/parts/t/partition_max_parts_inv_innodb-master.opt 2013-05-16 08:48:40 +0000
16@@ -0,0 +1,1 @@
17+--secure-file-priv=$MYSQL_TMP_DIR
18
19=== added file 'Percona-Server/mysql-test/suite/parts/t/partition_max_parts_inv_myisam-master.opt'
20--- Percona-Server/mysql-test/suite/parts/t/partition_max_parts_inv_myisam-master.opt 1970-01-01 00:00:00 +0000
21+++ Percona-Server/mysql-test/suite/parts/t/partition_max_parts_inv_myisam-master.opt 2013-05-16 08:48:40 +0000
22@@ -0,0 +1,1 @@
23+--secure-file-priv=$MYSQL_TMP_DIR
24
25=== added file 'Percona-Server/mysql-test/suite/parts/t/partition_max_parts_key_innodb-master.opt'
26--- Percona-Server/mysql-test/suite/parts/t/partition_max_parts_key_innodb-master.opt 1970-01-01 00:00:00 +0000
27+++ Percona-Server/mysql-test/suite/parts/t/partition_max_parts_key_innodb-master.opt 2013-05-16 08:48:40 +0000
28@@ -0,0 +1,1 @@
29+--secure-file-priv=$MYSQL_TMP_DIR
30
31=== added file 'Percona-Server/mysql-test/suite/parts/t/partition_max_parts_key_myisam-master.opt'
32--- Percona-Server/mysql-test/suite/parts/t/partition_max_parts_key_myisam-master.opt 1970-01-01 00:00:00 +0000
33+++ Percona-Server/mysql-test/suite/parts/t/partition_max_parts_key_myisam-master.opt 2013-05-16 08:48:40 +0000
34@@ -0,0 +1,1 @@
35+--secure-file-priv=$MYSQL_TMP_DIR
36
37=== added file 'Percona-Server/mysql-test/suite/parts/t/partition_max_parts_list_innodb-master.opt'
38--- Percona-Server/mysql-test/suite/parts/t/partition_max_parts_list_innodb-master.opt 1970-01-01 00:00:00 +0000
39+++ Percona-Server/mysql-test/suite/parts/t/partition_max_parts_list_innodb-master.opt 2013-05-16 08:48:40 +0000
40@@ -0,0 +1,1 @@
41+--secure-file-priv=$MYSQL_TMP_DIR
42
43=== added file 'Percona-Server/mysql-test/suite/parts/t/partition_max_parts_list_myisam-master.opt'
44--- Percona-Server/mysql-test/suite/parts/t/partition_max_parts_list_myisam-master.opt 1970-01-01 00:00:00 +0000
45+++ Percona-Server/mysql-test/suite/parts/t/partition_max_parts_list_myisam-master.opt 2013-05-16 08:48:40 +0000
46@@ -0,0 +1,1 @@
47+--secure-file-priv=$MYSQL_TMP_DIR
48
49=== added file 'Percona-Server/mysql-test/suite/parts/t/partition_max_parts_range_innodb-master.opt'
50--- Percona-Server/mysql-test/suite/parts/t/partition_max_parts_range_innodb-master.opt 1970-01-01 00:00:00 +0000
51+++ Percona-Server/mysql-test/suite/parts/t/partition_max_parts_range_innodb-master.opt 2013-05-16 08:48:40 +0000
52@@ -0,0 +1,1 @@
53+--secure-file-priv=$MYSQL_TMP_DIR
54
55=== added file 'Percona-Server/mysql-test/suite/parts/t/partition_max_parts_range_myisam-master.opt'
56--- Percona-Server/mysql-test/suite/parts/t/partition_max_parts_range_myisam-master.opt 1970-01-01 00:00:00 +0000
57+++ Percona-Server/mysql-test/suite/parts/t/partition_max_parts_range_myisam-master.opt 2013-05-16 08:48:40 +0000
58@@ -0,0 +1,1 @@
59+--secure-file-priv=$MYSQL_TMP_DIR
60
61=== added file 'Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_list_innodb-master.opt'
62--- Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_list_innodb-master.opt 1970-01-01 00:00:00 +0000
63+++ Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_list_innodb-master.opt 2013-05-16 08:48:40 +0000
64@@ -0,0 +1,1 @@
65+--secure-file-priv=$MYSQL_TMP_DIR
66
67=== added file 'Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_list_myisam-master.opt'
68--- Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_list_myisam-master.opt 1970-01-01 00:00:00 +0000
69+++ Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_list_myisam-master.opt 2013-05-16 08:48:40 +0000
70@@ -0,0 +1,1 @@
71+--secure-file-priv=$MYSQL_TMP_DIR
72
73=== added file 'Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_range_innodb-master.opt'
74--- Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_range_innodb-master.opt 1970-01-01 00:00:00 +0000
75+++ Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_range_innodb-master.opt 2013-05-16 08:48:40 +0000
76@@ -0,0 +1,1 @@
77+--secure-file-priv=$MYSQL_TMP_DIR
78
79=== added file 'Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_range_myisam-master.opt'
80--- Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_range_myisam-master.opt 1970-01-01 00:00:00 +0000
81+++ Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_key_range_myisam-master.opt 2013-05-16 08:48:40 +0000
82@@ -0,0 +1,1 @@
83+--secure-file-priv=$MYSQL_TMP_DIR
84
85=== added file 'Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_list_innodb-master.opt'
86--- Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_list_innodb-master.opt 1970-01-01 00:00:00 +0000
87+++ Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_list_innodb-master.opt 2013-05-16 08:48:40 +0000
88@@ -0,0 +1,1 @@
89+--secure-file-priv=$MYSQL_TMP_DIR
90
91=== added file 'Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_list_myisam-master.opt'
92--- Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_list_myisam-master.opt 1970-01-01 00:00:00 +0000
93+++ Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_list_myisam-master.opt 2013-05-16 08:48:40 +0000
94@@ -0,0 +1,1 @@
95+--secure-file-priv=$MYSQL_TMP_DIR
96
97=== added file 'Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_range_innodb-master.opt'
98--- Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_range_innodb-master.opt 1970-01-01 00:00:00 +0000
99+++ Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_range_innodb-master.opt 2013-05-16 08:48:40 +0000
100@@ -0,0 +1,1 @@
101+--secure-file-priv=$MYSQL_TMP_DIR
102
103=== added file 'Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_range_myisam-master.opt'
104--- Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_range_myisam-master.opt 1970-01-01 00:00:00 +0000
105+++ Percona-Server/mysql-test/suite/parts/t/partition_max_sub_parts_range_myisam-master.opt 2013-05-16 08:48:40 +0000
106@@ -0,0 +1,1 @@
107+--secure-file-priv=$MYSQL_TMP_DIR

Subscribers

People subscribed via source and target branches