summaryrefslogtreecommitdiff
path: root/include/mysql.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/mysql.h')
-rw-r--r--include/mysql.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/mysql.h b/include/mysql.h
index d922b552e38..dcdbe3a07a4 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -187,9 +187,9 @@ struct st_mysql_options {
my_bool secure_auth;
/* function pointers for local infile support */
- int (*local_infile_init)(void **, char *);
+ int (*local_infile_init)(void **, const char *);
int (*local_infile_read)(void *, char *, uint);
- int (*local_infile_end)(void *);
+ void (*local_infile_end)(void *);
int (*local_infile_error)(void *, char *, uint);
};
@@ -394,12 +394,12 @@ my_bool STDCALL mysql_slave_send_query(MYSQL *mysql, const char *q,
#define LOCAL_INFILE_ERROR_LEN 512
-int
+void
mysql_set_local_infile_handler(MYSQL *mysql,
- int (*local_infile_init)(void **, char *),
+ int (*local_infile_init)(void **, const char *),
int (*local_infile_read)(void *, char *, uint),
- int (*local_infile_end)(void *),
- int (*local_infile_error)(void *, char *, uint));
+ void (*local_infile_end)(void *),
+ int (*local_infile_error)(void *, char*, uint));
void
mysql_set_local_infile_default(MYSQL *mysql);