Merge lp:~laurynas-biveinis/percona-server/ci-fixes-5.6.11 into lp:percona-server/5.6

Proposed by Laurynas Biveinis
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 355
Proposed branch: lp:~laurynas-biveinis/percona-server/ci-fixes-5.6.11
Merge into: lp:percona-server/5.6
Diff against target: 101 lines (+17/-8)
3 files modified
Percona-Server/mysql-test/mysql-test-run.pl (+1/-1)
Percona-Server/mysql-test/t/failed_auth_3909-master.opt (+1/-0)
Percona-Server/sql/sql_table.cc (+15/-7)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/ci-fixes-5.6.11
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+165528@code.launchpad.net

Description of the change

http://jenkins.percona.com/job/percona-server-5.6-param/115/ - Jenkins results quite poor but they do show that the issues addressed here are fixed.

    Fix bug 1163135 (audit_plugin, multi_plugin_load_add2,
    multi_plugin_load_add, bug12969156 failures, 27 spurious MTR skips on
    5.6 Jenkins debug config).

    The test failures were caused by MTR failing to find the required
    built plugins due to errorneously prepending "debug" directory to
    their path names in read_plugin_defs() in mysql-test-run.pl, while in
    fact no such directory is created during build. Fixed by skipping this
    "debug"-adding code if MTR is run on a source tree (as opposed to
    package-installed tree).

    Fix bug 1182889 (Missing bug 1017192 DEBUG_SYNC site, breaking
    percona_bug1017192.test).

    The issue is that the 5.5 to 5.6 merge, that included the relevant 5.5
    revision, dropped the sql_table.cc changes, although it did take the
    testcase. Fix by applying the 5.5 bug 1017192 patch to 5.6.

    Fix bug 1182876 (Failed_auth_3909 warning check failure).

    The failing warning check is due to new in 5.6.11 plugin verification
    bugfix/feature. Since the testcase uses bogus plugins, it trips those
    checks. 5.6.11 also provides an option to disable them, thus fix by
    add a failed_auth_3909-master.opt file with
    --validate_user_plugins=OFF.

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=== modified file 'Percona-Server/mysql-test/mysql-test-run.pl'
2--- Percona-Server/mysql-test/mysql-test-run.pl 2013-05-12 09:13:00 +0000
3+++ Percona-Server/mysql-test/mysql-test-run.pl 2013-05-24 04:02:31 +0000
4@@ -2226,7 +2226,7 @@
5 mtr_error("Lines in $defs_file must have 3 or 4 items") unless $plug_var;
6
7 # If running debug server, plugins will be in 'debug' subdirectory
8- $plug_file= "debug/$plug_file" if $running_debug;
9+ $plug_file= "debug/$plug_file" if $running_debug && !$source_dist;
10
11 my ($plugin)= find_plugin($plug_file, $plug_loc);
12
13
14=== added file 'Percona-Server/mysql-test/t/failed_auth_3909-master.opt'
15--- Percona-Server/mysql-test/t/failed_auth_3909-master.opt 1970-01-01 00:00:00 +0000
16+++ Percona-Server/mysql-test/t/failed_auth_3909-master.opt 2013-05-24 04:02:31 +0000
17@@ -0,0 +1,1 @@
18+--validate_user_plugins=OFF
19
20=== modified file 'Percona-Server/sql/sql_table.cc'
21--- Percona-Server/sql/sql_table.cc 2013-05-13 04:25:56 +0000
22+++ Percona-Server/sql/sql_table.cc 2013-05-24 04:02:31 +0000
23@@ -184,6 +184,13 @@
24 diagnostic, error etc. when it would be useful to know what a particular
25 file [and directory] means. Such as SHOW ENGINE STATUS, error messages etc.
26
27+ Examples:
28+
29+ t1#P#p1 table t1 partition p1
30+ t1#P#p1#SP#sp1 table t1 partition p1 subpartition sp1
31+ t1#P#p1#SP#sp1#TMP# table t1 partition p1 subpartition sp1 temporary
32+ t1#P#p1#SP#sp1#REN# table t1 partition p1 subpartition sp1 renamed
33+
34 @param thd Thread handle
35 @param from Path name in my_charset_filename
36 Null terminated in my_charset_filename, normalized
37@@ -222,7 +229,7 @@
38 int part_name_len= 0;
39 const char *subpart_name= NULL;
40 int subpart_name_len= 0;
41- enum enum_file_name_type {NORMAL, TEMP, RENAMED} name_type= NORMAL;
42+ uint name_variant= NORMAL_PART_NAME;
43 const char *tmp_p;
44 DBUG_ENTER("explain_filename");
45 DBUG_PRINT("enter", ("from '%s'", from));
46@@ -265,7 +272,6 @@
47 (tmp_p[2] == 'L' || tmp_p[2] == 'l') &&
48 tmp_p[3] == '-')
49 {
50- name_type= TEMP;
51 tmp_p+= 4; /* sql- prefix found */
52 }
53 else
54@@ -276,7 +282,7 @@
55 if ((tmp_p[1] == 'M' || tmp_p[1] == 'm') &&
56 (tmp_p[2] == 'P' || tmp_p[2] == 'p') &&
57 tmp_p[3] == '#' && !tmp_p[4])
58- name_type= TEMP;
59+ name_variant= TEMP_PART_NAME;
60 else
61 res= 3;
62 tmp_p+= 4;
63@@ -286,7 +292,7 @@
64 if ((tmp_p[1] == 'E' || tmp_p[1] == 'e') &&
65 (tmp_p[2] == 'N' || tmp_p[2] == 'n') &&
66 tmp_p[3] == '#' && !tmp_p[4])
67- name_type= RENAMED;
68+ name_variant= RENAMED_PART_NAME;
69 else
70 res= 4;
71 tmp_p+= 4;
72@@ -311,7 +317,7 @@
73 subpart_name_len= strlen(subpart_name);
74 else
75 part_name_len= strlen(part_name);
76- if (name_type != NORMAL)
77+ if (name_variant != NORMAL_PART_NAME)
78 {
79 if (subpart_name)
80 subpart_name_len-= 5;
81@@ -353,9 +359,9 @@
82 to_p= strnmov(to_p, " ", end_p - to_p);
83 else
84 to_p= strnmov(to_p, ", ", end_p - to_p);
85- if (name_type != NORMAL)
86+ if (name_variant != NORMAL_PART_NAME)
87 {
88- if (name_type == TEMP)
89+ if (name_variant == TEMP_PART_NAME)
90 to_p= strnmov(to_p, ER_THD_OR_DEFAULT(thd, ER_TEMPORARY_NAME),
91 end_p - to_p);
92 else
93@@ -9028,6 +9034,8 @@
94 free_io_cache(from);
95 delete [] copy; // This is never 0
96
97+ DEBUG_SYNC(thd, "after_copy_data_between_tables");
98+
99 if (to->file->ha_end_bulk_insert() && error <= 0)
100 {
101 to->file->print_error(my_errno,MYF(0));

Subscribers

People subscribed via source and target branches