diff options
author | holyfoot/hf@mysql.com/deer.(none) <> | 2006-07-18 14:52:29 +0500 |
---|---|---|
committer | holyfoot/hf@mysql.com/deer.(none) <> | 2006-07-18 14:52:29 +0500 |
commit | bed7b69243cf04bfde409222285b563596c6f359 (patch) | |
tree | 942c3cb8d61303a6fe7a697ad2c646f07cb442b8 /libmysqld/embedded_priv.h | |
parent | 14519de0fc98fa749565470cfc80cd6a131582ad (diff) | |
parent | eddaafb12ba48d110f03a901884ab4101624c1a3 (diff) | |
download | mariadb-git-bed7b69243cf04bfde409222285b563596c6f359.tar.gz |
Merge mysql.com:/home/hf/work/mysql-4.1.mrg
into mysql.com:/home/hf/work/mysql-5.0.mrg
Diffstat (limited to 'libmysqld/embedded_priv.h')
-rw-r--r-- | libmysqld/embedded_priv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmysqld/embedded_priv.h b/libmysqld/embedded_priv.h index 88015340e8c..5ba6f34a2eb 100644 --- a/libmysqld/embedded_priv.h +++ b/libmysqld/embedded_priv.h @@ -18,9 +18,9 @@ C_MODE_START 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 init_embedded_mysql(MYSQL *mysql, int client_flag); +void *create_embedded_thd(int client_flag); +int check_embedded_connection(MYSQL *mysql, const char *db); void free_old_query(MYSQL *mysql); extern MYSQL_METHODS embedded_methods; |