1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

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
This commit is contained in:
unknown
2004-05-07 14:50:10 +02:00
parent c207325aaf
commit c6bc3cfb84
3 changed files with 16 additions and 7 deletions

View File

@ -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);