diff options
author | unknown <serg@serg.mylan> | 2004-11-17 18:04:36 +0100 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2004-11-17 18:04:36 +0100 |
commit | 4f6413094c069cb78aee0c9b1b7d77b34eb3ae5d (patch) | |
tree | 35f1caf73d4e61d1cb7338841a38299682005317 /sql/slave.h | |
parent | 7f5be1b65460bea40661bbeefe209831b528c67d (diff) | |
parent | 6ce9ed784e5507073a33b8c4771fba16f29f840f (diff) | |
download | mariadb-git-4f6413094c069cb78aee0c9b1b7d77b34eb3ae5d.tar.gz |
merged
client/Makefile.am:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/heap_hash.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
mysql-test/t/user_var.test:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/structs.h:
Auto merged
Diffstat (limited to 'sql/slave.h')
-rw-r--r-- | sql/slave.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.h b/sql/slave.h index 34e3e20ce06..e73c81a1e6f 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -508,7 +508,7 @@ 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); -const char *rewrite_db(const char* db, uint *new_db_len); +const char *rewrite_db(const char* db, uint32 *new_db_len); 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); |