diff options
| author | unknown <guilhem@mysql.com> | 2004-06-21 16:37:33 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-06-21 16:37:33 +0200 |
| commit | 6091a75f774ce8d3241c269db54a4f21784f0351 (patch) | |
| tree | ac54c6276eb66b61d9890e39d089c0b4995d2506 /include | |
| parent | d2fb4c281c2c3d2d9967b167feab79f441b56618 (diff) | |
| parent | 7ef30b69841e008958df2a6f855842b413e622f8 (diff) | |
| download | mariadb-git-6091a75f774ce8d3241c269db54a4f21784f0351.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql_com.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 90859b467c6..d7d0133a093 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -225,7 +225,7 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY, enum enum_shutdown_level { /* - We want levels to be in growing order of gracefulness. So we leave room + We want levels to be in growing order of hardness. So we leave room for future intermediate levels. For now, escalating one level is += 10; later if we insert new levels in between we will need a function next_shutdown_level(level). Note that DEFAULT does not respect the @@ -237,11 +237,12 @@ enum enum_shutdown_level { something). WAIT_ALL_BUFFERS is what we have now. Others are "this MySQL server does not support this shutdown level yet". */ - SHUTDOWN_WAIT_CRITICAL_BUFFERS= 10, /* flush MyISAM buffs (no corruption) */ - SHUTDOWN_WAIT_ALL_BUFFERS= 20, /* flush InnoDB buffers */ + SHUTDOWN_WAIT_CONNECTIONS= 10, /* wait for existing connections to finish */ + SHUTDOWN_WAIT_TRANSACTIONS= 20, /* wait for existing trans to finish */ SHUTDOWN_WAIT_STATEMENTS= 30, /* wait for existing updating stmts to finish */ - SHUTDOWN_WAIT_TRANSACTIONS= 40, /* wait for existing trans to finish */ - SHUTDOWN_WAIT_CONNECTIONS= 50 /* wait for existing connections to finish */ + SHUTDOWN_WAIT_ALL_BUFFERS= 40, /* flush InnoDB buffers */ + SHUTDOWN_WAIT_CRITICAL_BUFFERS= 50, /* flush MyISAM buffs (no corruption) */ + SHUTDOWN_ENUM_END= 255 /* must be last */ }; /* options for mysql_set_option */ |