Merge lp:~percona-toolkit-dev/percona-toolkit/fix-pt-upgrade-null-bug-1168434 into lp:~percona-toolkit-dev/percona-toolkit/release-2.2.4

Proposed by Daniel Nichter
Status: Merged
Merged at revision: 590
Proposed branch: lp:~percona-toolkit-dev/percona-toolkit/fix-pt-upgrade-null-bug-1168434
Merge into: lp:~percona-toolkit-dev/percona-toolkit/release-2.2.4
Diff against target: 179 lines (+121/-0)
9 files modified
bin/pt-upgrade (+4/-0)
t/pt-upgrade/diff_rows.t (+14/-0)
t/pt-upgrade/samples/007/null.log (+4/-0)
t/pt-upgrade/samples/007/null.txt (+35/-0)
t/pt-upgrade/samples/007/null_results.txt (+32/-0)
t/pt-upgrade/samples/007/null_results/query (+3/-0)
t/pt-upgrade/samples/007/null_results/results (+6/-0)
t/pt-upgrade/samples/007/null_results/rows (+12/-0)
t/pt-upgrade/samples/007/tables.sql (+11/-0)
To merge this branch: bzr merge lp:~percona-toolkit-dev/percona-toolkit/fix-pt-upgrade-null-bug-1168434
Reviewer Review Type Date Requested Status
Daniel Nichter Approve
Review via email: mp+171646@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Nichter (daniel-nichter) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/pt-upgrade'
2--- bin/pt-upgrade 2013-06-25 22:32:19 +0000
3+++ bin/pt-upgrade 2013-06-26 19:29:25 +0000
4@@ -10255,6 +10255,10 @@
5
6 my $n_vals = $size_array1 - 1; # arrays are zero-indexed
7 for my $i ( 0..$n_vals ) {
8+ # NULL == NULL
9+ # https://bugs.launchpad.net/percona-toolkit/+bug/1168434
10+ next if !defined $array1->[$i] && !defined $array2->[$i];
11+
12 if ( defined $array1->[$i] && defined $array2->[$i] ) {
13 return 0 unless $array1->[$i] eq $array2->[$i];
14 }
15
16=== modified file 't/pt-upgrade/diff_rows.t'
17--- t/pt-upgrade/diff_rows.t 2013-02-20 00:03:50 +0000
18+++ t/pt-upgrade/diff_rows.t 2013-06-26 19:29:25 +0000
19@@ -112,6 +112,20 @@
20 );
21
22 # #############################################################################
23+# https://bugs.launchpad.net/percona-toolkit/+bug/1168434
24+# pt-upgrade reports differences on NULL
25+# #############################################################################
26+
27+$sb->load_file('master', "t/pt-upgrade/samples/007/tables.sql");
28+
29+test_diff(
30+ name => 'Bug 1168434: no diff with NULL',
31+ query1 => 'select * from test.t order by id',
32+ query2 => 'select * from test.t order by id',
33+ expect => [],
34+);
35+
36+# #############################################################################
37 # Done.
38 # #############################################################################
39 $sb->wipe_clean($dbh);
40
41=== added directory 't/pt-upgrade/samples/007'
42=== added file 't/pt-upgrade/samples/007/null.log'
43--- t/pt-upgrade/samples/007/null.log 1970-01-01 00:00:00 +0000
44+++ t/pt-upgrade/samples/007/null.log 2013-06-26 19:29:25 +0000
45@@ -0,0 +1,4 @@
46+# User@Host: root[root] @ localhost []
47+# Query_time: 1 Lock_time: 0 Rows_sent: 7 Rows_examined: 7
48+use test;
49+select * from test.t order by id;
50
51=== added file 't/pt-upgrade/samples/007/null.txt'
52--- t/pt-upgrade/samples/007/null.txt 1970-01-01 00:00:00 +0000
53+++ t/pt-upgrade/samples/007/null.txt 2013-06-26 19:29:25 +0000
54@@ -0,0 +1,35 @@
55+
56+#-----------------------------------------------------------------------
57+# Logs
58+#-----------------------------------------------------------------------
59+
60+File: ...
61+Size: 145
62+
63+#-----------------------------------------------------------------------
64+# Hosts
65+#-----------------------------------------------------------------------
66+
67+host1:
68+
69+ DSN: h=127.1,P=12345
70+ hostname: ...
71+ MySQL: ...
72+
73+host2:
74+
75+ DSN: h=127.1,P=12348
76+ hostname: ...
77+ MySQL: ...
78+
79+#-----------------------------------------------------------------------
80+# Stats
81+#-----------------------------------------------------------------------
82+
83+failed_queries 0
84+not_select 0
85+queries_filtered 0
86+queries_no_diffs 1
87+queries_read 1
88+queries_with_diffs 0
89+queries_with_errors 0
90
91=== added directory 't/pt-upgrade/samples/007/null_results'
92=== added file 't/pt-upgrade/samples/007/null_results.txt'
93--- t/pt-upgrade/samples/007/null_results.txt 1970-01-01 00:00:00 +0000
94+++ t/pt-upgrade/samples/007/null_results.txt 2013-06-26 19:29:25 +0000
95@@ -0,0 +1,32 @@
96+
97+#-----------------------------------------------------------------------
98+# Logs
99+#-----------------------------------------------------------------------
100+
101+Results directory: ...
102+
103+#-----------------------------------------------------------------------
104+# Hosts
105+#-----------------------------------------------------------------------
106+
107+host1:
108+
109+ Reading results from ...
110+
111+host2:
112+
113+ DSN: h=127.1,P=12348
114+ hostname: ...
115+ MySQL: ...
116+
117+#-----------------------------------------------------------------------
118+# Stats
119+#-----------------------------------------------------------------------
120+
121+failed_queries 0
122+not_select 0
123+queries_filtered 0
124+queries_no_diffs 1
125+queries_read 1
126+queries_with_diffs 0
127+queries_with_errors 0
128
129=== added file 't/pt-upgrade/samples/007/null_results/query'
130--- t/pt-upgrade/samples/007/null_results/query 1970-01-01 00:00:00 +0000
131+++ t/pt-upgrade/samples/007/null_results/query 2013-06-26 19:29:25 +0000
132@@ -0,0 +1,3 @@
133+use `test`;
134+select * from test.t order by id
135+##
136
137=== added file 't/pt-upgrade/samples/007/null_results/results'
138--- t/pt-upgrade/samples/007/null_results/results 1970-01-01 00:00:00 +0000
139+++ t/pt-upgrade/samples/007/null_results/results 2013-06-26 19:29:25 +0000
140@@ -0,0 +1,6 @@
141+$results = {
142+ query_time => '0',
143+ warnings => {}
144+};
145+
146+##
147
148=== added file 't/pt-upgrade/samples/007/null_results/rows'
149--- t/pt-upgrade/samples/007/null_results/rows 1970-01-01 00:00:00 +0000
150+++ t/pt-upgrade/samples/007/null_results/rows 2013-06-26 19:29:25 +0000
151@@ -0,0 +1,12 @@
152+$rows = [
153+ [
154+ '1',
155+ 'a'
156+ ],
157+ [
158+ '2',
159+ undef
160+ ]
161+];
162+
163+##
164
165=== added file 't/pt-upgrade/samples/007/tables.sql'
166--- t/pt-upgrade/samples/007/tables.sql 1970-01-01 00:00:00 +0000
167+++ t/pt-upgrade/samples/007/tables.sql 2013-06-26 19:29:25 +0000
168@@ -0,0 +1,11 @@
169+DROP DATABASE IF EXISTS test;
170+CREATE DATABASE test;
171+USE test;
172+CREATE TABLE t (
173+ id int(10) NOT NULL AUTO_INCREMENT,
174+ username varchar(8) default NULL,
175+ PRIMARY KEY (`id`)
176+);
177+INSERT INTO t VALUES
178+ (null, 'a'),
179+ (null, null);

Subscribers

People subscribed via source and target branches

to all changes: