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 | 17ef75b399d34e58613fc8f6297f01b77e46b895 (patch) | |
| tree | 1bb5b160e9bb81115b19732348ba96c4bf069602 /include/sql_common.h | |
| parent | 3094f9e6abe613ca08b75a83285c594fb4033bc1 (diff) | |
| parent | dd3384b6977c1e80903c8e002ebe2d8b710d2689 (diff) | |
| download | mariadb-git-17ef75b399d34e58613fc8f6297f01b77e46b895.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/sql_common.h')
| -rw-r--r-- | include/sql_common.h | 1 |
1 files changed, 0 insertions, 1 deletions
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); |