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

[Alexey Kopytov]

    Bug #1192454: Debug builds fail on Ubuntu Quantal/Raring

    Fixed compiler warnings by backporting the corresponding changes from
    upstream. Ideally this should be fixed by rebasing on newer upstream
    versions, but that is better implemented as a separate task and only
    for 2.1, whereas we need to fix builds on Quantal/Raring for both 2.0
    and 2.1.

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

[George Ormond Lorch III (gl-az)]

review: Approve (g2)

=== modified file 'patches/innodb51.patch'
--- patches/innodb51.patch	2013-05-07 13:32:47 +0000
+++ patches/innodb51.patch	2013-07-05 05:40:43 +0000
@@ -1504,3 +1504,69 @@
  
  # Request support for automake silent-rules if available.
  # Default to verbose output. One can use the configure-time
+--- a/sql/log.h
++++ b/sql/log.h
+@@ -289,8 +289,8 @@
+   int new_file_impl(bool need_lock);
+ 
+ public:
+-  MYSQL_LOG::generate_name;
+-  MYSQL_LOG::is_open;
++  using MYSQL_LOG::generate_name;
++  using MYSQL_LOG::is_open;
+ 
+   /* This is relay log */
+   bool is_relay_log;
+--- a/storage/innodb_plugin/handler/ha_innodb.cc
++++ b/storage/innodb_plugin/handler/ha_innodb.cc
+@@ -10756,7 +10756,7 @@
+ static MYSQL_SYSVAR_ULONG(io_capacity, srv_io_capacity,
+   PLUGIN_VAR_RQCMDARG,
+   "Number of IOPs the server can do. Tunes the background IO rate",
+-  NULL, NULL, 200, 100, ~0L, 0);
++  NULL, NULL, 200, 100, ~0UL, 0);
+ 
+ static MYSQL_SYSVAR_ULONG(fast_shutdown, innobase_fast_shutdown,
+   PLUGIN_VAR_OPCMDARG,
+@@ -10834,7 +10834,7 @@
+ static MYSQL_SYSVAR_ULONG(max_purge_lag, srv_max_purge_lag,
+   PLUGIN_VAR_RQCMDARG,
+   "Desired maximum length of the purge queue (0 = no limit)",
+-  NULL, NULL, 0, 0, ~0L, 0);
++  NULL, NULL, 0, 0, ~0UL, 0);
+ 
+ static MYSQL_SYSVAR_BOOL(rollback_on_timeout, innobase_rollback_on_timeout,
+   PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
+@@ -10891,7 +10891,7 @@
+ static MYSQL_SYSVAR_ULONG(concurrency_tickets, srv_n_free_tickets_to_enter,
+   PLUGIN_VAR_RQCMDARG,
+   "Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket",
+-  NULL, NULL, 500L, 1L, ~0L, 0);
++  NULL, NULL, 500L, 1L, ~0UL, 0);
+ 
+ static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads,
+   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR,
+@@ -10953,12 +10953,12 @@
+ static MYSQL_SYSVAR_ULONG(sync_spin_loops, srv_n_spin_wait_rounds,
+   PLUGIN_VAR_RQCMDARG,
+   "Count of spin-loop rounds in InnoDB mutexes (30 by default)",
+-  NULL, NULL, 30L, 0L, ~0L, 0);
++  NULL, NULL, 30L, 0L, ~0UL, 0);
+ 
+ static MYSQL_SYSVAR_ULONG(spin_wait_delay, srv_spin_wait_delay,
+   PLUGIN_VAR_OPCMDARG,
+   "Maximum delay between polling for a spin lock (6 by default)",
+-  NULL, NULL, 6L, 0L, ~0L, 0);
++  NULL, NULL, 6L, 0L, ~0UL, 0);
+ 
+ static MYSQL_SYSVAR_ULONG(thread_concurrency, srv_thread_concurrency,
+   PLUGIN_VAR_RQCMDARG,
+@@ -10968,7 +10968,7 @@
+ static MYSQL_SYSVAR_ULONG(thread_sleep_delay, srv_thread_sleep_delay,
+   PLUGIN_VAR_RQCMDARG,
+   "Time of innodb thread sleeping before joining InnoDB queue (usec). Value 0 disable a sleep",
+-  NULL, NULL, 10000L, 0L, ~0L, 0);
++  NULL, NULL, 10000L, 0L, ~0UL, 0);
+ 
+ static MYSQL_SYSVAR_STR(data_file_path, innobase_data_file_path,
+   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,

=== modified file 'patches/innodb55.patch'
--- patches/innodb55.patch	2013-05-07 13:32:47 +0000
+++ patches/innodb55.patch	2013-07-05 05:40:43 +0000
@@ -1426,3 +1426,69 @@
  
  	UNIV_MEM_FREE(buf, n);
  }
+--- a/sql/log.h
++++ b/sql/log.h
+@@ -348,8 +348,8 @@
+   int new_file_impl(bool need_lock);
+ 
+ public:
+-  MYSQL_LOG::generate_name;
+-  MYSQL_LOG::is_open;
++  using MYSQL_LOG::generate_name;
++  using MYSQL_LOG::is_open;
+ 
+   /* This is relay log */
+   bool is_relay_log;
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
+@@ -11109,7 +11109,7 @@
+ static MYSQL_SYSVAR_ULONG(io_capacity, srv_io_capacity,
+   PLUGIN_VAR_RQCMDARG,
+   "Number of IOPs the server can do. Tunes the background IO rate",
+-  NULL, NULL, 200, 100, ~0L, 0);
++  NULL, NULL, 200, 100, ~0UL, 0);
+ 
+ static MYSQL_SYSVAR_ULONG(purge_batch_size, srv_purge_batch_size,
+   PLUGIN_VAR_OPCMDARG,
+@@ -11226,7 +11226,7 @@
+ static MYSQL_SYSVAR_ULONG(max_purge_lag, srv_max_purge_lag,
+   PLUGIN_VAR_RQCMDARG,
+   "Desired maximum length of the purge queue (0 = no limit)",
+-  NULL, NULL, 0, 0, ~0L, 0);
++  NULL, NULL, 0, 0, ~0UL, 0);
+ 
+ static MYSQL_SYSVAR_BOOL(rollback_on_timeout, innobase_rollback_on_timeout,
+   PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
+@@ -11288,7 +11288,7 @@
+ static MYSQL_SYSVAR_ULONG(concurrency_tickets, srv_n_free_tickets_to_enter,
+   PLUGIN_VAR_RQCMDARG,
+   "Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket",
+-  NULL, NULL, 500L, 1L, ~0L, 0);
++  NULL, NULL, 500L, 1L, ~0UL, 0);
+ 
+ static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads,
+   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR,
+@@ -11350,12 +11350,12 @@
+ static MYSQL_SYSVAR_ULONG(sync_spin_loops, srv_n_spin_wait_rounds,
+   PLUGIN_VAR_RQCMDARG,
+   "Count of spin-loop rounds in InnoDB mutexes (30 by default)",
+-  NULL, NULL, 30L, 0L, ~0L, 0);
++  NULL, NULL, 30L, 0L, ~0UL, 0);
+ 
+ static MYSQL_SYSVAR_ULONG(spin_wait_delay, srv_spin_wait_delay,
+   PLUGIN_VAR_OPCMDARG,
+   "Maximum delay between polling for a spin lock (6 by default)",
+-  NULL, NULL, 6L, 0L, ~0L, 0);
++  NULL, NULL, 6L, 0L, ~0UL, 0);
+ 
+ static MYSQL_SYSVAR_ULONG(thread_concurrency, srv_thread_concurrency,
+   PLUGIN_VAR_RQCMDARG,
+@@ -11365,7 +11365,7 @@
+ static MYSQL_SYSVAR_ULONG(thread_sleep_delay, srv_thread_sleep_delay,
+   PLUGIN_VAR_RQCMDARG,
+   "Time of innodb thread sleeping before joining InnoDB queue (usec). Value 0 disable a sleep",
+-  NULL, NULL, 10000L, 0L, ~0L, 0);
++  NULL, NULL, 10000L, 0L, ~0UL, 0);
+ 
+ static MYSQL_SYSVAR_STR(data_file_path, innobase_data_file_path,
+   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,