3466 Alfranio Correia 2010-12-21 [merge]
merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing
modified:
sql/rpl_info.cc
sql/rpl_info.h
sql/rpl_info_factory.cc
sql/rpl_mi.cc
sql/rpl_mi.h
sql/rpl_rli.cc
sql/rpl_rli.h
3465 Anitha Gopi 2010-12-21 [merge]
BUG #59055: Up merge revision 3225 from mysql-5.5-bugteam
modified:
mysql-test/lib/v1/mysql-test-run.pl
mysql-test/suite/funcs_1/t/disabled.def
mysql-test/suite/funcs_2/t/disabled.def
mysql-test/suite/parts/t/disabled.def
=== modified file 'sql/rpl_info.cc'
--- a/sql/rpl_info.cc 2010-07-27 19:26:54 +0000
+++ b/sql/rpl_info.cc 2010-12-21 09:33:41 +0000
@@ -17,28 +17,42 @@
#include <sql_priv.h>
#include "rpl_info.h"
-Rpl_info::Rpl_info(const char* type,
- PSI_mutex_key *param_key_info_run_lock,
+Rpl_info::Rpl_info(const char* type
+#ifdef HAVE_PSI_INTERFACE
+ ,PSI_mutex_key *param_key_info_run_lock,
PSI_mutex_key *param_key_info_data_lock,
PSI_mutex_key *param_key_info_data_cond,
PSI_mutex_key *param_key_info_start_cond,
- PSI_mutex_key *param_key_info_stop_cond)
+ PSI_mutex_key *param_key_info_stop_cond
+#endif
+ )
:Slave_reporting_capability(type),
+#ifdef HAVE_PSI_INTERFACE
key_info_run_lock(param_key_info_run_lock),
key_info_data_lock(param_key_info_data_lock),
key_info_data_cond(param_key_info_data_cond),
key_info_start_cond(param_key_info_start_cond),
key_info_stop_cond(param_key_info_stop_cond),
+#endif
info_thd(0), inited(0), abort_slave(0),
slave_running(0), slave_run_id(0),
handler(0)
{
- mysql_mutex_init(*key_info_run_lock, &run_lock, MY_MUTEX_INIT_FAST);
+#ifdef HAVE_PSI_INTERFACE
+ mysql_mutex_init(*key_info_run_lock,
+ &run_lock, MY_MUTEX_INIT_FAST);
mysql_mutex_init(*key_info_data_lock,
&data_lock, MY_MUTEX_INIT_FAST);
mysql_cond_init(*key_info_data_cond, &data_cond, NULL);
mysql_cond_init(*key_info_start_cond, &start_cond, NULL);
mysql_cond_init(*key_info_stop_cond, &stop_cond, NULL);
+#else
+ mysql_mutex_init(NULL, &run_lock, MY_MUTEX_INIT_FAST);
+ mysql_mutex_init(NULL, &data_lock, MY_MUTEX_INIT_FAST);
+ mysql_cond_init(NULL, &data_cond, NULL);
+ mysql_cond_init(NULL, &start_cond, NULL);
+ mysql_cond_init(NULL, &stop_cond, NULL);
+#endif
}
Rpl_info::~Rpl_info()
=== modified file 'sql/rpl_info.h'
--- a/sql/rpl_info.h 2010-10-25 10:39:01 +0000
+++ b/sql/rpl_info.h 2010-12-21 09:33:41 +0000
@@ -34,11 +34,13 @@ public:
stop_cond - when stopped
data_cond - when data protected by data_lock changes
*/
- mysql_cond_t data_cond,start_cond,stop_cond;
+ mysql_cond_t data_cond,start_cond, stop_cond;
+#ifdef HAVE_PSI_INTERFACE
PSI_mutex_key *key_info_run_lock, *key_info_data_lock;
PSI_mutex_key *key_info_data_cond, *key_info_start_cond, *key_info_stop_cond;
+#endif
THD *info_thd;
@@ -51,12 +53,15 @@ public:
int events_until_exit;
#endif
- Rpl_info(const char* type,
- PSI_mutex_key *param_key_info_run_lock,
+ Rpl_info(const char* type
+#ifdef HAVE_PSI_INTERFACE
+ ,PSI_mutex_key *param_key_info_run_lock,
PSI_mutex_key *param_key_info_data_lock,
PSI_mutex_key *param_key_info_data_cond,
PSI_mutex_key *param_key_info_start_cond,
- PSI_mutex_key *param_key_info_stop_cond);
+ PSI_mutex_key *param_key_info_stop_cond
+#endif
+ );
virtual ~Rpl_info();
int check_info()
=== modified file 'sql/rpl_info_factory.cc'
--- a/sql/rpl_info_factory.cc 2010-10-29 18:16:48 +0000
+++ b/sql/rpl_info_factory.cc 2010-12-21 09:33:41 +0000
@@ -87,11 +87,15 @@ Master_info *Rpl_info_factory::create_mi
DBUG_ENTER("Rpl_info_factory::Rpl_info_factory");
- if (!(mi= new Master_info(&key_master_info_run_lock,
+ if (!(mi= new Master_info(
+#ifdef HAVE_PSI_INTERFACE
+ &key_master_info_run_lock,
&key_master_info_data_lock,
&key_master_info_data_cond,
&key_master_info_start_cond,
- &key_master_info_stop_cond)))
+ &key_master_info_stop_cond
+#endif
+ )))
goto err;
/*
@@ -163,12 +167,15 @@ Relay_log_info *Rpl_info_factory::create
DBUG_ENTER("Rpl_info_factory::create_rli");
- if (!(rli= new Relay_log_info(is_slave_recovery,
- &key_relay_log_info_run_lock,
+ if (!(rli= new Relay_log_info(is_slave_recovery
+#ifdef HAVE_PSI_INTERFACE
+ ,&key_relay_log_info_run_lock,
&key_relay_log_info_data_lock,
&key_relay_log_info_data_cond,
&key_relay_log_info_start_cond,
- &key_relay_log_info_stop_cond)))
+ &key_relay_log_info_stop_cond
+#endif
+ )))
goto err;
/*
=== modified file 'sql/rpl_mi.cc'
--- a/sql/rpl_mi.cc 2010-11-29 18:35:56 +0000
+++ b/sql/rpl_mi.cc 2010-12-21 09:33:41 +0000
@@ -76,14 +76,22 @@ const char *info_mi_fields []=
"retry_count"
};
-Master_info::Master_info(PSI_mutex_key *param_key_info_run_lock,
+Master_info::Master_info(
+#ifdef HAVE_PSI_INTERFACE
+ PSI_mutex_key *param_key_info_run_lock,
PSI_mutex_key *param_key_info_data_lock,
PSI_mutex_key *param_key_info_data_cond,
PSI_mutex_key *param_key_info_start_cond,
- PSI_mutex_key *param_key_info_stop_cond)
- :Rpl_info("I/O", param_key_info_run_lock, param_key_info_data_lock,
+ PSI_mutex_key *param_key_info_stop_cond
+#endif
+ )
+ :Rpl_info("I/O"
+#ifdef HAVE_PSI_INTERFACE
+ ,param_key_info_run_lock, param_key_info_data_lock,
param_key_info_data_cond, param_key_info_start_cond,
- param_key_info_stop_cond),
+ param_key_info_stop_cond
+#endif
+ ),
ssl(0), ssl_verify_server_cert(0),
port(MYSQL_PORT), connect_retry(DEFAULT_CONNECT_RETRY),
clock_diff_with_master(0), heartbeat_period(0),
=== modified file 'sql/rpl_mi.h'
--- a/sql/rpl_mi.h 2010-11-29 18:35:56 +0000
+++ b/sql/rpl_mi.h 2010-12-21 09:33:41 +0000
@@ -63,11 +63,15 @@ typedef struct st_mysql MYSQL;
class Master_info : public Rpl_info
{
public:
- Master_info(PSI_mutex_key *param_key_info_run_lock,
+ Master_info(
+#ifdef HAVE_PSI_INTERFACE
+ PSI_mutex_key *param_key_info_run_lock,
PSI_mutex_key *param_key_info_data_lock,
PSI_mutex_key *param_key_info_data_cond,
PSI_mutex_key *param_key_info_start_cond,
- PSI_mutex_key *param_key_info_stop_cond);
+ PSI_mutex_key *param_key_info_stop_cond
+#endif
+ );
virtual ~Master_info();
/* the variables below are needed because we can change masters on the fly */
=== modified file 'sql/rpl_rli.cc'
--- a/sql/rpl_rli.cc 2010-11-29 11:28:55 +0000
+++ b/sql/rpl_rli.cc 2010-12-21 09:33:41 +0000
@@ -45,15 +45,22 @@ const char* info_rli_fields[]=
const char *const Relay_log_info::state_delaying_string = "Waiting until MASTER_DELAY seconds after master executed event";
-Relay_log_info::Relay_log_info(bool is_slave_recovery,
- PSI_mutex_key *param_key_info_run_lock,
+Relay_log_info::Relay_log_info(bool is_slave_recovery
+#ifdef HAVE_PSI_INTERFACE
+ ,PSI_mutex_key *param_key_info_run_lock,
PSI_mutex_key *param_key_info_data_lock,
PSI_mutex_key *param_key_info_data_cond,
PSI_mutex_key *param_key_info_start_cond,
- PSI_mutex_key *param_key_info_stop_cond)
- :Rpl_info("SQL", param_key_info_run_lock, param_key_info_data_lock,
+ PSI_mutex_key *param_key_info_stop_cond
+#endif
+ )
+ :Rpl_info("SQL"
+#ifdef HAVE_PSI_INTERFACE
+ ,param_key_info_run_lock, param_key_info_data_lock,
param_key_info_data_cond, param_key_info_start_cond,
- param_key_info_stop_cond),
+ param_key_info_stop_cond
+#endif
+ ),
replicate_same_server_id(::replicate_same_server_id),
cur_log_fd(-1), relay_log(&sync_relaylog_period),
is_relay_log_recovery(is_slave_recovery),
=== modified file 'sql/rpl_rli.h'
--- a/sql/rpl_rli.h 2010-11-15 16:43:41 +0000
+++ b/sql/rpl_rli.h 2010-12-21 09:33:41 +0000
@@ -328,12 +328,15 @@ public:
char slave_patternload_file[FN_REFLEN];
size_t slave_patternload_file_size;
- Relay_log_info(bool is_slave_recovery,
- PSI_mutex_key *param_key_info_run_lock,
+ Relay_log_info(bool is_slave_recovery
+#ifdef HAVE_PSI_INTERFACE
+ ,PSI_mutex_key *param_key_info_run_lock,
PSI_mutex_key *param_key_info_data_lock,
PSI_mutex_key *param_key_info_data_cond,
PSI_mutex_key *param_key_info_start_cond,
- PSI_mutex_key *param_key_info_stop_cond);
+ PSI_mutex_key *param_key_info_stop_cond
+#endif
+ );
virtual ~Relay_log_info();
/**
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-bugfixing branch (alfranio.correia:3465 to 3466) | Alfranio Correia | 21 Dec |
