diff options
| author | unknown <hf@deer.(none)> | 2004-08-19 15:47:09 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-08-19 15:47:09 +0500 |
| commit | 37c025e6f9e862725a819076a4967dfc4913974d (patch) | |
| tree | 1bb5b160e9bb81115b19732348ba96c4bf069602 /include | |
| parent | cba27e4a91d18439f421b3a33d27df8a2bfa04c1 (diff) | |
| parent | de40ed916e4d4a70cee06250682e8a2c52d527a8 (diff) | |
| download | mariadb-git-37c025e6f9e862725a819076a4967dfc4913974d.tar.gz | |
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 1 | ||||
| -rw-r--r-- | include/sql_common.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h index 0f3fdc90548..b339b839ab3 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -627,6 +627,7 @@ typedef struct st_mysql_methods MYSQL_RES * (*use_result)(MYSQL *mysql); void (*fetch_lengths)(unsigned long *to, MYSQL_ROW column, unsigned int field_count); + void (*flush_use_result)(MYSQL *mysql); #if !defined(MYSQL_SERVER) || defined(EMBEDDED_LIBRARY) MYSQL_FIELD * (*list_fields)(MYSQL *mysql); my_bool (*read_prepare_result)(MYSQL *mysql, MYSQL_STMT *stmt); diff --git a/include/sql_common.h b/include/sql_common.h index 3f50008a922..cde53786f83 100644 --- a/include/sql_common.h +++ b/include/sql_common.h @@ -25,7 +25,6 @@ extern "C" { MYSQL_FIELD *unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, my_bool default_value, uint server_capabilities); void free_rows(MYSQL_DATA *cur); -void flush_use_result(MYSQL *mysql); my_bool mysql_autenticate(MYSQL *mysql, const char *passwd); void free_old_query(MYSQL *mysql); void end_server(MYSQL *mysql); |