diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-07-18 14:52:29 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-07-18 14:52:29 +0500 |
| commit | 2dfdcae3989a12e513aee2ba2df86edfb27b0e7e (patch) | |
| tree | 942c3cb8d61303a6fe7a697ad2c646f07cb442b8 /libmysqld/embedded_priv.h | |
| parent | 8f5681c91915db689a4bbfa95346705cbb51f717 (diff) | |
| parent | d9992cc79eb8c51c2b967ec60137638583a8143d (diff) | |
| download | mariadb-git-2dfdcae3989a12e513aee2ba2df86edfb27b0e7e.tar.gz | |
Merge mysql.com:/home/hf/work/mysql-4.1.mrg
into mysql.com:/home/hf/work/mysql-5.0.mrg
libmysqld/embedded_priv.h:
Auto merged
sql-common/client.c:
Auto merged
include/mysql.h:
merging
libmysql/libmysql.c:
merging
libmysqld/lib_sql.cc:
merging
libmysqld/libmysqld.c:
merging
sql/sql_parse.cc:
merging
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; |