diff options
| author | unknown <pem@mysql.comhem.se> | 2004-08-19 20:48:00 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.comhem.se> | 2004-08-19 20:48:00 +0200 |
| commit | 0ed563e80180a848dbd8a3d062663ce14b479e11 (patch) | |
| tree | 31c3fe06544c8228d9cfc9fdc0e5d6ef19ab6c33 /include/mysql_com.h | |
| parent | e3c56fd4d7f85b16adb7c929061fefee6895ba55 (diff) | |
| download | mariadb-git-0ed563e80180a848dbd8a3d062663ce14b479e11.tar.gz | |
Fixed symbol name problems that made build fail.
include/mysql.h:
Fixed symbol name change.
include/mysql_com.h:
Reverted parts of previous changeset (name changes) to make it build.
libmysql/libmysql.c:
Fixed symbol name change.
sql/sql_parse.cc:
Fixed symbol name change.
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 12 |
1 files changed, 6 insertions, 6 deletions
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, |