diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-08-07 20:18:51 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-08-07 20:18:51 +0300 |
| commit | 6db21de014d603477952c7a16449bcae40a70e5c (patch) | |
| tree | dede3c4032371335b0e52c74cca1beba2483d7c6 /sql/slave.h | |
| parent | 46f5c97d312a84c0620958f4fcf0df6acd676256 (diff) | |
| parent | fa1613be0a54ba87321501a52d62d4e99d237945 (diff) | |
| download | mariadb-git-6db21de014d603477952c7a16449bcae40a70e5c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/slave.h b/sql/slave.h index 193b0ab9dd7..19411aba497 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -382,8 +382,8 @@ int add_table_rule(HASH* h, const char* table_spec); int add_wild_table_rule(DYNAMIC_ARRAY* a, const char* table_spec); void init_table_rule_hash(HASH* h, bool* h_inited); void init_table_rule_array(DYNAMIC_ARRAY* a, bool* a_inited); -char* rewrite_db(char* db); -char* print_slave_db_safe(char* db); +const char *rewrite_db(const char* db); +const char *print_slave_db_safe(const char* db); int check_expected_error(THD* thd, RELAY_LOG_INFO* rli, int error_code); void skip_load_data_infile(NET* net); void slave_print_error(RELAY_LOG_INFO* rli, int err_code, const char* msg, ...); |