diff options
| author | Mikael Ronstrom <mikael@dator8> | 2011-03-04 12:53:56 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@dator8> | 2011-03-04 12:53:56 +0100 |
| commit | 5f24be65270c844ba705de9121a95b3bb048dcc3 (patch) | |
| tree | 5f3fc27633a670778eed8ce16f50e03c1941f3a1 /sql/sql_class.h | |
| parent | fd926652dee10209f42b117aba0ca69bad411aa7 (diff) | |
| download | mariadb-git-5f24be65270c844ba705de9121a95b3bb048dcc3.tar.gz | |
Changed prefix from ES_ to STMT_ on Query arena state
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 5d600eab2a3..7e63205018a 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -624,14 +624,14 @@ public: /* The states relfects three diffrent life cycles for three different types of statements: - Prepared statement: ES_INITIALIZED -> ES_PREPARED -> ES_EXECUTED. - Stored procedure: ES_INITIALIZED_FOR_SP -> ES_EXECUTED. - Other statements: ES_CONVENTIONAL_EXECUTION never changes. + Prepared statement: STMT_INITIALIZED -> STMT_PREPARED -> STMT_EXECUTED. + Stored procedure: STMT_INITIALIZED_FOR_SP -> STMT_EXECUTED. + Other statements: STMT_CONVENTIONAL_EXECUTION never changes. */ enum enum_state { - ES_INITIALIZED= 0, ES_INITIALIZED_FOR_SP= 1, ES_PREPARED= 2, - ES_CONVENTIONAL_EXECUTION= 3, ES_EXECUTED= 4, ES_ERROR= -1 + STMT_INITIALIZED= 0, STMT_INITIALIZED_FOR_SP= 1, STMT_PREPARED= 2, + STMT_CONVENTIONAL_EXECUTION= 3, STMT_EXECUTED= 4, STMT_ERROR= -1 }; enum_state state; @@ -654,18 +654,18 @@ public: virtual Type type() const; virtual ~Query_arena() {}; - inline bool is_stmt_prepare() const { return state == ES_INITIALIZED; } + inline bool is_stmt_prepare() const { return state == STMT_INITIALIZED; } inline bool is_first_sp_execute() const - { return state == ES_INITIALIZED_FOR_SP; } + { return state == STMT_INITIALIZED_FOR_SP; } inline bool is_stmt_prepare_or_first_sp_execute() const - { return (int)state < (int)ES_PREPARED; } + { return (int)state < (int)STMT_PREPARED; } inline bool is_stmt_prepare_or_first_stmt_execute() const - { return (int)state <= (int)ES_PREPARED; } - inline bool is_first_stmt_execute() const { return state == ES_PREPARED; } + { return (int)state <= (int)STMT_PREPARED; } + inline bool is_first_stmt_execute() const { return state == STMT_PREPARED; } inline bool is_stmt_execute() const - { return state == ES_PREPARED || state == ES_EXECUTED; } + { return state == STMT_PREPARED || state == STMT_EXECUTED; } inline bool is_conventional() const - { return state == ES_CONVENTIONAL_EXECUTION; } + { return state == STMT_CONVENTIONAL_EXECUTION; } inline void* alloc(size_t size) { return alloc_root(mem_root,size); } inline void* calloc(size_t size) |