diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-09-15 05:04:15 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-09-15 05:04:15 +0400 |
| commit | 77f8a772d7c469e6a0d22f928d743be63ee6836d (patch) | |
| tree | 7fbdb4fc54884b70ae12f8c3238077e6d88ead05 /sql | |
| parent | 858173c428bb81b9709894955f66f23348a0e418 (diff) | |
| download | mariadb-git-77f8a772d7c469e6a0d22f928d743be63ee6836d.tar.gz | |
Make MariaDB work on windows:
- fix xtradb compile failures on windows (why do we have to do it again?)
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 3 | ||||
| -rw-r--r-- | sql/slave.h | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 6e038a60cb0..0cb8544b880 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -663,7 +663,8 @@ uint master_port= MYSQL_PORT, master_connect_retry = 60; uint report_port= MYSQL_PORT; ulong master_retry_count=0; char *master_user, *master_password, *master_host, *master_info_file; -char *relay_log_info_file, *report_user, *report_password, *report_host; +char *relay_log_info_file; +char *report_user, *report_password, *report_host; char *opt_relay_logname = 0, *opt_relaylog_index_name=0; my_bool master_ssl; char *master_ssl_key, *master_ssl_cert; diff --git a/sql/slave.h b/sql/slave.h index a44a7eed83e..fe9694c2392 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -101,7 +101,8 @@ extern MY_BITMAP slave_error_mask; extern char slave_skip_error_names[]; extern bool use_slave_mask; extern char *slave_load_tmpdir; -extern char *master_info_file, *relay_log_info_file; +extern char *master_info_file; +extern MYSQL_PLUGIN_IMPORT char *relay_log_info_file; extern char *opt_relay_logname, *opt_relaylog_index_name; extern my_bool opt_skip_slave_start, opt_reckless_slave; extern my_bool opt_log_slave_updates; @@ -205,7 +206,7 @@ extern int disconnect_slave_event_count, abort_slave_event_count ; /* the master variables are defaults read from my.cnf or command line */ extern uint master_port, master_connect_retry, report_port; extern char * master_user, *master_password, *master_host; -extern char *master_info_file, *relay_log_info_file, *report_user; +extern char *master_info_file, *report_user; extern char *report_host, *report_password; extern my_bool master_ssl; |