diff options
| author | unknown <hf@deer.(none)> | 2004-01-07 21:30:15 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-01-07 21:30:15 +0400 |
| commit | 582886a3e971df2766411cdfe57c8a09f3c2e6b6 (patch) | |
| tree | d20819ba4aaa9081734e46a63958402010176176 /libmysqld/embedded_priv.h | |
| parent | 902c361910cdec368c5baec1be6079978a46f1a8 (diff) | |
| download | mariadb-git-582886a3e971df2766411cdfe57c8a09f3c2e6b6.tar.gz | |
Fix for 1224 (USER() CURRENT_USER() functions in embedded library)
Now we return user@host for USER() in embedded library
CURRENT_USER returns empty string if library compiled with
NO_EMBEDDED_ACCESS_CHECKS
libmysqld/embedded_priv.h:
function's declarations trimmed
libmysqld/lib_sql.cc:
user/host names handling added
libmysqld/libmysqld.c:
user/host names handling added
sql/sql_class.cc:
we shouldn't free user/host names in embedded library
Diffstat (limited to 'libmysqld/embedded_priv.h')
| -rw-r--r-- | libmysqld/embedded_priv.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libmysqld/embedded_priv.h b/libmysqld/embedded_priv.h index 673531c0c14..1608f4ed4ad 100644 --- a/libmysqld/embedded_priv.h +++ b/libmysqld/embedded_priv.h @@ -23,9 +23,10 @@ #include <my_pthread.h> C_MODE_START -extern void lib_connection_phase(NET *net, int phase); -extern void init_embedded_mysql(MYSQL *mysql, int client_flag, char *db); -extern void *create_embedded_thd(int client_flag, char *db); -extern MYSQL_METHODS embedded_methods; +void lib_connection_phase(NET *net, int phase); +void init_embedded_mysql(MYSQL *mysql, int client_flag, char *db); +void *create_embedded_thd(int client_flag, char *db); +int check_embedded_connection(MYSQL *mysql); void free_old_query(MYSQL *mysql); +extern MYSQL_METHODS embedded_methods; C_MODE_END |