diff options
| author | guilhem@mysql.com <> | 2003-09-11 23:17:28 +0200 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2003-09-11 23:17:28 +0200 |
| commit | 59663fc661891a375f59a87d17ed9545175975be (patch) | |
| tree | 17368ba287e00c5ee8a4b28a65a34bbf5fb4e4f5 /sql/slave.h | |
| parent | 99490870e6fbc26208d044d712e28b1095f0aada (diff) | |
| download | mariadb-git-59663fc661891a375f59a87d17ed9545175975be.tar.gz | |
* Fix for BUG#1248: "LOAD DATA FROM MASTER drops the slave's db unexpectedly".
Now LOAD DATA FROM MASTER does not drop the database, instead it only tries to
create it, and drops/creates table-by-table.
* replicate_wild_ignore_table='db1.%' is now considered as "ignore the 'db1'
database as a whole", as it already works for CREATE DATABASE and DROP DATABASE.
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 67bf009763b..f61891acc91 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -384,9 +384,9 @@ int start_slave_thread(pthread_handler h_func, pthread_mutex_t* start_lock, int mysql_table_dump(THD* thd, const char* db, const char* tbl_name, int fd = -1); -/* retrieve non-exitent table from master */ +/* retrieve table from master and copy to slave*/ int fetch_master_table(THD* thd, const char* db_name, const char* table_name, - MASTER_INFO* mi, MYSQL* mysql); + MASTER_INFO* mi, MYSQL* mysql, bool overwrite); int show_master_info(THD* thd, MASTER_INFO* mi); int show_binlog_info(THD* thd); |