summaryrefslogtreecommitdiff
path: root/sql/log.h
diff options
context:
space:
mode:
authorGuilhem Bichot <guilhem.bichot@oracle.com>2011-05-21 10:59:32 +0200
committerGuilhem Bichot <guilhem.bichot@oracle.com>2011-05-21 10:59:32 +0200
commit27fa7876c8ad9a574bab5ab489a6d369a3d78947 (patch)
tree5ec3599cb2beed91477c85d0593eda12939c1c6e /sql/log.h
parent12f651ac9ddfb21187c69ae7a50c72440f7025c8 (diff)
parent34d731ef781d379fde668409ce264139d738aa4d (diff)
downloadmariadb-git-27fa7876c8ad9a574bab5ab489a6d369a3d78947.tar.gz
merge from latest 5.5
Diffstat (limited to 'sql/log.h')
-rw-r--r--sql/log.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/log.h b/sql/log.h
index f6d60a2fe3c..0f0f81dd402 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -63,9 +63,9 @@ class TC_LOG_MMAP: public TC_LOG
{
public: // only to keep Sun Forte on sol9x86 happy
typedef enum {
- POOL, // page is in pool
- ERROR, // last sync failed
- DIRTY // new xids added since last sync
+ PS_POOL, // page is in pool
+ PS_ERROR, // last sync failed
+ PS_DIRTY // new xids added since last sync
} PAGE_STATE;
private: