diff options
| author | unknown <georg@beethoven.local> | 2004-05-07 14:50:10 +0200 |
|---|---|---|
| committer | unknown <georg@beethoven.local> | 2004-05-07 14:50:10 +0200 |
| commit | c6bc3cfb8457332b4519efcd10339c2632626acb (patch) | |
| tree | 8cb43a4e180fbb542e232223ea3d1cb006361dd7 /include | |
| parent | c207325aaf0cbb3781d72891c9ae95e18c6ea355 (diff) | |
| download | mariadb-git-c6bc3cfb8457332b4519efcd10339c2632626acb.tar.gz | |
Added additional parameter userdata for mysql_set_local_infile_handler
to allow binding of userland functions in PHP.
include/mysql.h:
added new last parameter (void *) for mysql_set_local_infile_handler
st_mysql_options:
added void *local_infile_userdata
added last parameter (void *) for local_infile_init function pointer
libmysql/libmysql.c:
added parameter userdata in mysql_set_local_infile_handler
added parameter (void *userdata __attribute__ ((unused))) in mysql_local_infile_init
passed additional parameter userdata to init function in handle_local_infile
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/mysql.h b/include/mysql.h index 537467336f8..51540a7d89f 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -188,10 +188,11 @@ struct st_mysql_options { my_bool secure_auth; /* function pointers for local infile support */ - int (*local_infile_init)(void **, const char *); + int (*local_infile_init)(void **, const char *, void *); int (*local_infile_read)(void *, char *, unsigned int); void (*local_infile_end)(void *); int (*local_infile_error)(void *, char *, unsigned int); + void *local_infile_userdata; }; enum mysql_status @@ -397,12 +398,14 @@ my_bool STDCALL mysql_slave_send_query(MYSQL *mysql, const char *q, void mysql_set_local_infile_handler(MYSQL *mysql, - int (*local_infile_init)(void **, const char *), + int (*local_infile_init)(void **, const char *, + void *), int (*local_infile_read)(void *, char *, unsigned int), void (*local_infile_end)(void *), int (*local_infile_error)(void *, char*, - unsigned int)); + unsigned int), + void *); void mysql_set_local_infile_default(MYSQL *mysql); |