summaryrefslogtreecommitdiff
path: root/sql/slave.h
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2000-11-24 19:49:13 -0700
committersasha@mysql.sashanet.com <>2000-11-24 19:49:13 -0700
commita9ef0b4bf11c25b64c38aee037a03f0875b9003c (patch)
tree8369a6e73770b40358d3b22b40c94e58de8913e4 /sql/slave.h
parent93ac0a2582d4e0e83f61002ae28825b5c722a722 (diff)
downloadmariadb-git-a9ef0b4bf11c25b64c38aee037a03f0875b9003c.tar.gz
slave master.info FILE -> IO_CACHE
send_file() is more stack-friendly - changed large static buffer to alloc_root() fixed my_b_seek() to work with WRITE_CACHE test case to make sure the slave starts correctly after being stopped truncated words file so the replication tests will take less time
Diffstat (limited to 'sql/slave.h')
-rw-r--r--sql/slave.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/slave.h b/sql/slave.h
index 1d6be16ad34..fb559e8260c 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -5,8 +5,8 @@ typedef struct st_master_info
{
char log_file_name[FN_REFLEN];
ulonglong pos,pending;
- FILE* file; // we keep the file open, so we need to remember the file pointer
-
+ File fd; // we keep the file open, so we need to remember the file pointer
+ IO_CACHE file;
// the variables below are needed because we can change masters on the fly
char host[HOSTNAME_LENGTH+1];
char user[USERNAME_LENGTH+1];
@@ -16,7 +16,7 @@ typedef struct st_master_info
pthread_mutex_t lock;
bool inited;
- st_master_info():pending(0),inited(0)
+ st_master_info():pending(0),fd(-1),inited(0)
{
host[0] = 0; user[0] = 0; password[0] = 0;
pthread_mutex_init(&lock, NULL);