summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-05-16 08:48:52 +0200
committerSergei Golubchik <serg@mariadb.org>2015-06-02 18:53:36 +0200
commit80e61ae21e2373ee73407f91f596b11c2c46e7d9 (patch)
tree6478f01d7bc067fb7c526056b1544b3567753993 /include
parent91dab5ddb6accbb256e7089aea8ba38e66a1b0cf (diff)
downloadmariadb-git-80e61ae21e2373ee73407f91f596b11c2c46e7d9.tar.gz
cleanup: LOAD DATA replication support in IO_CACHE
remove some 14-year old code that added support for LOAD DATA replication to IO_CACHE: * three callbacks, of which only two were actually used and that were only needed for LOAD DATA replication but were tested in every IO_CACHE instance * an additional opaque void * argument in IO_CACHE, also only used for LOAD DATA replication, but present everywhere * the code to close IO_CACHE prematurely in LOAD DATA to have these callbacks called in the correct order and a long comment explaining what will happen if IO_CACHE is not closed prematurely * a variable to track whether IO_CACHE was closed prematurely (to avoid double-closing it)
Diffstat (limited to 'include')
-rw-r--r--include/my_sys.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index d9536356cda..17ad872e4e9 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -364,7 +364,6 @@ typedef struct st_dynamic_string
} DYNAMIC_STRING;
struct st_io_cache;
-typedef int (*IO_CACHE_CALLBACK)(struct st_io_cache*);
typedef struct st_io_cache_share
{
@@ -461,22 +460,11 @@ typedef struct st_io_cache /* Used when cacheing files */
*/
enum cache_type type;
/*
- Callbacks when the actual read I/O happens. These were added and
- are currently used for binary logging of LOAD DATA INFILE - when a
- block is read from the file, we create a block create/append event, and
- when IO_CACHE is closed, we create an end event. These functions could,
- of course be used for other things
- */
- IO_CACHE_CALLBACK pre_read;
- IO_CACHE_CALLBACK post_read;
- IO_CACHE_CALLBACK pre_close;
- /*
Counts the number of times, when we were forced to use disk. We use it to
increase the binlog_cache_disk_use and binlog_stmt_cache_disk_use status
variables.
*/
ulong disk_writes;
- void* arg; /* for use by pre/post_read */
char *file_name; /* if used with 'open_cached_file' */
const char *dir;
char prefix[3];