Merge lp:~akopytov/percona-xtrabackup/bug1248331-2.1 into lp:percona-xtrabackup/2.1

Proposed by Alexey Kopytov
Status: Merged
Approved by: George Ormond Lorch III
Approved revision: no longer in the source branch.
Merged at revision: 710
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1248331-2.1
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 30 lines (+13/-2)
2 files modified
innobackupex.pl (+2/-2)
test/t/bug1248331.sh (+11/-0)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1248331-2.1
Reviewer Review Type Date Requested Status
George Ormond Lorch III (community) g2 Approve
Review via email: mp+200149@code.launchpad.net

Description of the change

    Bug #1248331: innobackupex error with ANSI_QUOTES sql_mode

    Replaced double quotes with single ones in the SQL statement issued by
    detect_mysql_capabilities_for_backup().

http://jenkins.percona.com/view/PXB%202.1/job/percona-xtrabackup-2.1-param/507/

To post a comment you must log in.
Revision history for this message
George Ormond Lorch III (gl-az) :
review: Approve (g2)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'innobackupex.pl'
2--- innobackupex.pl 2013-11-21 10:08:38 +0000
3+++ innobackupex.pl 2013-12-29 19:11:28 +0000
4@@ -4807,8 +4807,8 @@
5 #
6 sub detect_mysql_capabilities_for_backup {
7 $have_changed_page_bitmaps =
8- mysql_query($_[0], 'SELECT COUNT(*) FROM INFORMATION_SCHEMA.PLUGINS '.
9- 'WHERE PLUGIN_NAME LIKE "INNODB_CHANGED_PAGES"')
10+ mysql_query($_[0], "SELECT COUNT(*) FROM INFORMATION_SCHEMA.PLUGINS ".
11+ "WHERE PLUGIN_NAME LIKE 'INNODB_CHANGED_PAGES'");
12 }
13
14 =pod
15
16=== added file 'test/t/bug1248331.sh'
17--- test/t/bug1248331.sh 1970-01-01 00:00:00 +0000
18+++ test/t/bug1248331.sh 2013-12-29 19:11:28 +0000
19@@ -0,0 +1,11 @@
20+########################################################################
21+# Bug #1248331: innobackupex error with ANSI_QUOTES sql_mode
22+########################################################################
23+
24+ib_inc_extra_args=
25+
26+MYSQLD_EXTRA_MY_CNF_OPTS="
27+sql_mode=\"ANSI_QUOTES\"
28+"
29+
30+. inc/ib_incremental_common.sh

Subscribers

People subscribed via source and target branches

to all changes: