diff options
| author | unknown <hf@deer.(none)> | 2004-08-20 10:50:23 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-08-20 10:50:23 +0500 |
| commit | 2e09e96b05777bf186c2fbdfaff703c71af0f28a (patch) | |
| tree | 82d49439300c8a1f8f117da173ad6cb7c49748aa /include/mysql.h | |
| parent | 1d3a929ec97b791394060e84f809f1dd8cd28f26 (diff) | |
| parent | 83e6ea37be8b25cdfe34dc6aa198e780ecab1057 (diff) | |
| download | mariadb-git-2e09e96b05777bf186c2fbdfaff703c71af0f28a.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h index b339b839ab3..e2ed3ab59af 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -454,7 +454,7 @@ int STDCALL mysql_add_slave(MYSQL* mysql, const char* host, const char* passwd); int STDCALL mysql_shutdown(MYSQL *mysql, - enum enum_shutdown_level + enum mysql_enum_shutdown_level shutdown_level); int STDCALL mysql_dump_debug_info(MYSQL *mysql); int STDCALL mysql_refresh(MYSQL *mysql, |