Percona Toolkit moved to https://jira.percona.com/projects/PT

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

  1. fix-pt-upgrade-null-bug-1168434
  2. Merge into 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
=== modified file 'bin/pt-upgrade'
--- bin/pt-upgrade 2013-06-25 22:32:19 +0000
+++ bin/pt-upgrade 2013-06-26 19:29:25 +0000
@@ -10255,6 +10255,10 @@
1025510255
10256 my $n_vals = $size_array1 - 1; # arrays are zero-indexed10256 my $n_vals = $size_array1 - 1; # arrays are zero-indexed
10257 for my $i ( 0..$n_vals ) {10257 for my $i ( 0..$n_vals ) {
10258 # NULL == NULL
10259 # https://bugs.launchpad.net/percona-toolkit/+bug/1168434
10260 next if !defined $array1->[$i] && !defined $array2->[$i];
10261
10258 if ( defined $array1->[$i] && defined $array2->[$i] ) {10262 if ( defined $array1->[$i] && defined $array2->[$i] ) {
10259 return 0 unless $array1->[$i] eq $array2->[$i];10263 return 0 unless $array1->[$i] eq $array2->[$i];
10260 }10264 }
1026110265
=== modified file 't/pt-upgrade/diff_rows.t'
--- t/pt-upgrade/diff_rows.t 2013-02-20 00:03:50 +0000
+++ t/pt-upgrade/diff_rows.t 2013-06-26 19:29:25 +0000
@@ -112,6 +112,20 @@
112);112);
113113
114# #############################################################################114# #############################################################################
115# https://bugs.launchpad.net/percona-toolkit/+bug/1168434
116# pt-upgrade reports differences on NULL
117# #############################################################################
118
119$sb->load_file('master', "t/pt-upgrade/samples/007/tables.sql");
120
121test_diff(
122 name => 'Bug 1168434: no diff with NULL',
123 query1 => 'select * from test.t order by id',
124 query2 => 'select * from test.t order by id',
125 expect => [],
126);
127
128# #############################################################################
115# Done.129# Done.
116# #############################################################################130# #############################################################################
117$sb->wipe_clean($dbh);131$sb->wipe_clean($dbh);
118132
=== added directory 't/pt-upgrade/samples/007'
=== added file 't/pt-upgrade/samples/007/null.log'
--- t/pt-upgrade/samples/007/null.log 1970-01-01 00:00:00 +0000
+++ t/pt-upgrade/samples/007/null.log 2013-06-26 19:29:25 +0000
@@ -0,0 +1,4 @@
1# User@Host: root[root] @ localhost []
2# Query_time: 1 Lock_time: 0 Rows_sent: 7 Rows_examined: 7
3use test;
4select * from test.t order by id;
05
=== added file 't/pt-upgrade/samples/007/null.txt'
--- t/pt-upgrade/samples/007/null.txt 1970-01-01 00:00:00 +0000
+++ t/pt-upgrade/samples/007/null.txt 2013-06-26 19:29:25 +0000
@@ -0,0 +1,35 @@
1
2#-----------------------------------------------------------------------
3# Logs
4#-----------------------------------------------------------------------
5
6File: ...
7Size: 145
8
9#-----------------------------------------------------------------------
10# Hosts
11#-----------------------------------------------------------------------
12
13host1:
14
15 DSN: h=127.1,P=12345
16 hostname: ...
17 MySQL: ...
18
19host2:
20
21 DSN: h=127.1,P=12348
22 hostname: ...
23 MySQL: ...
24
25#-----------------------------------------------------------------------
26# Stats
27#-----------------------------------------------------------------------
28
29failed_queries 0
30not_select 0
31queries_filtered 0
32queries_no_diffs 1
33queries_read 1
34queries_with_diffs 0
35queries_with_errors 0
036
=== added directory 't/pt-upgrade/samples/007/null_results'
=== added file 't/pt-upgrade/samples/007/null_results.txt'
--- t/pt-upgrade/samples/007/null_results.txt 1970-01-01 00:00:00 +0000
+++ t/pt-upgrade/samples/007/null_results.txt 2013-06-26 19:29:25 +0000
@@ -0,0 +1,32 @@
1
2#-----------------------------------------------------------------------
3# Logs
4#-----------------------------------------------------------------------
5
6Results directory: ...
7
8#-----------------------------------------------------------------------
9# Hosts
10#-----------------------------------------------------------------------
11
12host1:
13
14 Reading results from ...
15
16host2:
17
18 DSN: h=127.1,P=12348
19 hostname: ...
20 MySQL: ...
21
22#-----------------------------------------------------------------------
23# Stats
24#-----------------------------------------------------------------------
25
26failed_queries 0
27not_select 0
28queries_filtered 0
29queries_no_diffs 1
30queries_read 1
31queries_with_diffs 0
32queries_with_errors 0
033
=== added file 't/pt-upgrade/samples/007/null_results/query'
--- t/pt-upgrade/samples/007/null_results/query 1970-01-01 00:00:00 +0000
+++ t/pt-upgrade/samples/007/null_results/query 2013-06-26 19:29:25 +0000
@@ -0,0 +1,3 @@
1use `test`;
2select * from test.t order by id
3##
04
=== added file 't/pt-upgrade/samples/007/null_results/results'
--- t/pt-upgrade/samples/007/null_results/results 1970-01-01 00:00:00 +0000
+++ t/pt-upgrade/samples/007/null_results/results 2013-06-26 19:29:25 +0000
@@ -0,0 +1,6 @@
1$results = {
2 query_time => '0',
3 warnings => {}
4};
5
6##
07
=== added file 't/pt-upgrade/samples/007/null_results/rows'
--- t/pt-upgrade/samples/007/null_results/rows 1970-01-01 00:00:00 +0000
+++ t/pt-upgrade/samples/007/null_results/rows 2013-06-26 19:29:25 +0000
@@ -0,0 +1,12 @@
1$rows = [
2 [
3 '1',
4 'a'
5 ],
6 [
7 '2',
8 undef
9 ]
10];
11
12##
013
=== added file 't/pt-upgrade/samples/007/tables.sql'
--- t/pt-upgrade/samples/007/tables.sql 1970-01-01 00:00:00 +0000
+++ t/pt-upgrade/samples/007/tables.sql 2013-06-26 19:29:25 +0000
@@ -0,0 +1,11 @@
1DROP DATABASE IF EXISTS test;
2CREATE DATABASE test;
3USE test;
4CREATE TABLE t (
5 id int(10) NOT NULL AUTO_INCREMENT,
6 username varchar(8) default NULL,
7 PRIMARY KEY (`id`)
8);
9INSERT INTO t VALUES
10 (null, 'a'),
11 (null, null);

Subscribers

People subscribed via source and target branches

to all changes: