diff options
| author | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-06-05 01:15:07 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-06-05 01:15:07 +0200 |
| commit | 20e331961b2ec797ce8a4acd9c0724bb118f20c4 (patch) | |
| tree | f59ef1650029ff1634fb8e8539ee2dd41dcb8872 /sql/slave.h | |
| parent | c5558be0e3d5fe8be0f5a63551a5215511a265e0 (diff) | |
| parent | 15d18a98e4e2917ac98ffbc807afd09c934dc6fb (diff) | |
| download | mariadb-git-20e331961b2ec797ce8a4acd9c0724bb118f20c4.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
mysql-test/t/func_misc.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_create.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
strings/ctype-ujis.c:
Auto merged
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/slave.h b/sql/slave.h index cb880c8125d..57806e65af7 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -94,9 +94,9 @@ class MASTER_INFO; extern ulong master_retry_count; extern MY_BITMAP slave_error_mask; extern bool use_slave_mask; -extern char* slave_load_tmpdir; -extern my_string master_info_file,relay_log_info_file; -extern my_string opt_relay_logname, opt_relaylog_index_name; +extern char *slave_load_tmpdir; +extern char *master_info_file, *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; extern ulonglong relay_log_space_limit; @@ -201,13 +201,13 @@ 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 my_string master_user, master_password, master_host, - master_info_file, relay_log_info_file, report_user, report_host, - report_password; +extern char * master_user, *master_password, *master_host; +extern char *master_info_file, *relay_log_info_file, *report_user; +extern char *report_host, *report_password; extern my_bool master_ssl; -extern my_string master_ssl_ca, master_ssl_capath, master_ssl_cert, - master_ssl_cipher, master_ssl_key; +extern char *master_ssl_ca, *master_ssl_capath, *master_ssl_cert; +extern char *master_ssl_cipher, *master_ssl_key; extern I_List<THD> threads; |