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

[Alexey Kopytov]

    Bug #1169169: xtrabackup_56 crashes when preparing a backup with
                  partitioned tables

    The problem was that xtrabackup_56 used the implementation of
    innobase_convert_identifier() provided by the InnoDB code, rather than a
    lightweight replacement provided in xtrabackup.cc for other build
    flavors. The full-blown implementation may call explain_filename() which
    requires MySQL localization subsystem to be initialized (which is
    normally initialized in init_common_variables() on server startup). In
    particular, it crashed when explain_filename() was called on a
    partitioned table.

    Since xtrabackup_56 links with ha_innodb.cc containing the full-blown
    implementation of innobase_convert_identifier(), the bug was fixed by
    replicating the lightweight version used by xtrabackup/xtrabackup_55 in
    innodb56.patch.

    An alternative approach would be to mimic localization subsystem
    initialization performed in mysqld.cc, but that pulls way too many
    dependencies.

    This revision also fixes bug #1170340 "require_partitioning in
    test/inc/ib_part.sh does not work with 5.6" (which was the reason why
    bug #1169169 have not been caught by the test suite).

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/266/

The ib_part* failures on *56 configurations is a result of missing remote tablespaces support (will be fixed in followup dependent MPs).

[Alexey Kopytov (akopytov)]

Here it shows the correct diff (unlike the 2.0 MP), but some spurious conflicts. It does not in fact have any conflicts with the current 2.1 trunk.

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'patches/innodb56.patch'
--- patches/innodb56.patch	2013-04-23 06:10:54 +0000
+++ patches/innodb56.patch	2013-04-23 06:10:55 +0000
@@ -524,7 +524,56 @@
  
  		if (thd && thd_sql_command(thd) == SQLCOM_DROP_TABLE) {
  
-@@ -16642,45 +16642,21 @@
+@@ -2423,43 +2423,19 @@
+ 	ulint		buflen,	/*!< in: length of buf, in bytes */
+ 	const char*	id,	/*!< in: identifier to convert */
+ 	ulint		idlen,	/*!< in: length of id, in bytes */
+-	THD*		thd,	/*!< in: MySQL connection thread, or NULL */
+-	ibool		file_id)/*!< in: TRUE=id is a table or database name;
++	THD*		thd __attribute__((unused)),
++				/*!< in: MySQL connection thread, or NULL */
++	ibool		file_id __attribute__((unused)))
++				/*!< in: TRUE=id is a table or database name;
+ 				FALSE=id is an UTF-8 string */
+ {
+-	char nz[NAME_LEN + 1];
+-	char nz2[NAME_LEN + 1 + EXPLAIN_FILENAME_MAX_EXTRA_LENGTH];
+-
+ 	const char*	s	= id;
+ 	int		q;
+ 
+-	if (file_id) {
+-		/* Decode the table name.  The MySQL function expects
+-		a NUL-terminated string.  The input and output strings
+-		buffers must not be shared. */
+-
+-		if (UNIV_UNLIKELY(idlen > (sizeof nz) - 1)) {
+-			idlen = (sizeof nz) - 1;
+-		}
+-
+-		memcpy(nz, id, idlen);
+-		nz[idlen] = 0;
+-
+-		s = nz2;
+-		idlen = explain_filename(thd, nz, nz2, sizeof nz2,
+-					 EXPLAIN_PARTITIONS_AS_COMMENT);
+-		goto no_quote;
+-	}
+-
+ 	/* See if the identifier needs to be quoted. */
+-	if (UNIV_UNLIKELY(!thd)) {
+-		q = '"';
+-	} else {
+-		q = get_quote_char_for_identifier(thd, s, (int) idlen);
+-	}
++	q = '"';
+ 
+ 	if (q == EOF) {
+-no_quote:
+ 		if (UNIV_UNLIKELY(idlen > buflen)) {
+ 			idlen = buflen;
+ 		}
+@@ -16642,45 +16618,21 @@
  void
  ib_logf(
  /*====*/

=== modified file 'test/inc/ib_part.sh'
--- test/inc/ib_part.sh	2013-03-07 11:38:14 +0000
+++ test/inc/ib_part.sh	2013-04-23 06:10:55 +0000
@@ -2,15 +2,15 @@
 
 function check_partitioning()
 {
-   $MYSQL $MYSQL_ARGS -Ns -e "show variables like 'have_partitioning'"
+    $MYSQL $MYSQL_ARGS -Ns -e "SHOW PLUGINS" 2> /dev/null |
+      egrep -q "^partition"
 }
 
 function require_partitioning()
 {
-	PARTITION_CHECK=`check_partitioning`
-
-	if [ -z "$PARTITION_CHECK" ]; then
-	    echo "Requires Partitioning." > $SKIPPED_REASON
+	if ! check_partitioning
+	then
+	    echo "Requires support for partitioning." > $SKIPPED_REASON
 	    exit $SKIPPED_EXIT_CODE
 	fi
 }