diff options
author | Konstantin Osipov <kostja@sun.com> | 2010-02-02 12:22:17 +0300 |
---|---|---|
committer | Konstantin Osipov <kostja@sun.com> | 2010-02-02 12:22:17 +0300 |
commit | c6c1ddabaf2d41b362921524d617fbc772c1c9b6 (patch) | |
tree | 919a1043e20b3f1f6a58331ae90a4a9529b0ab5e /sql/sql_class.h | |
parent | 665100b69dfebe45e2d3b68116c6718560bf63b2 (diff) | |
parent | d4f23f0cf6db38731a161c5c7b0b056fc67e5c02 (diff) | |
download | mariadb-git-c6c1ddabaf2d41b362921524d617fbc772c1c9b6.tar.gz |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 4fd4c0a1671..1261ae819a8 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -583,6 +583,8 @@ public: { return state == INITIALIZED_FOR_SP; } inline bool is_stmt_prepare_or_first_sp_execute() const { return (int)state < (int)PREPARED; } + inline bool is_stmt_prepare_or_first_stmt_execute() const + { return (int)state <= (int)PREPARED; } inline bool is_first_stmt_execute() const { return state == PREPARED; } inline bool is_stmt_execute() const { return state == PREPARED || state == EXECUTED; } |