diff options
| author | pem@mysql.comhem.se <> | 2004-08-19 20:48:00 +0200 |
|---|---|---|
| committer | pem@mysql.comhem.se <> | 2004-08-19 20:48:00 +0200 |
| commit | 2d7f4c30a738b089da6676a12f50b7c88fa7c2b3 (patch) | |
| tree | 31c3fe06544c8228d9cfc9fdc0e5d6ef19ab6c33 /include | |
| parent | 22a65bcf266fdf2a206b6cc234f16d0ced7fec5d (diff) | |
| download | mariadb-git-2d7f4c30a738b089da6676a12f50b7c88fa7c2b3.tar.gz | |
Fixed symbol name problems that made build fail.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 2 | ||||
| -rw-r--r-- | include/mysql_com.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/mysql.h b/include/mysql.h index 0f3fdc90548..52187c3ff28 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, diff --git a/include/mysql_com.h b/include/mysql_com.h index 36d41b2964a..3b65d6f3fbc 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -238,17 +238,17 @@ enum mysql_enum_shutdown_level { comparisons). Note that DEFAULT does not respect the growing property, but it's ok. */ - DEFAULT= 0, + SHUTDOWN_DEFAULT = 0, /* wait for existing connections to finish */ - WAIT_CONNECTIONS= MYSQL_SHUTDOWN_KILLABLE_CONNECT, + SHUTDOWN_WAIT_CONNECTIONS= MYSQL_SHUTDOWN_KILLABLE_CONNECT, /* wait for existing trans to finish */ - WAIT_TRANSACTIONS= MYSQL_SHUTDOWN_KILLABLE_TRANS, + SHUTDOWN_WAIT_TRANSACTIONS= MYSQL_SHUTDOWN_KILLABLE_TRANS, /* wait for existing updates to finish (=> no partial MyISAM update) */ - WAIT_UPDATES= MYSQL_SHUTDOWN_KILLABLE_UPDATE, + SHUTDOWN_WAIT_UPDATES= MYSQL_SHUTDOWN_KILLABLE_UPDATE, /* flush InnoDB buffers and other storage engines' buffers*/ - WAIT_ALL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1), + SHUTDOWN_WAIT_ALL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1), /* don't flush InnoDB buffers, flush other storage engines' buffers*/ - WAIT_CRITICAL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1) + 1, + SHUTDOWN_WAIT_CRITICAL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1) + 1, /* Now the 2 levels of the KILL command */ #if MYSQL_VERSION_ID >= 50000 KILL_QUERY= 254, |