diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-16 21:02:21 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-16 21:02:21 +0300 |
| commit | 5f0c09dd7220b7ad5709823788e9289fc94ab8fe (patch) | |
| tree | c656767fe54a976ffb669926348b9fac198be312 /sql/sql_class.h | |
| parent | 5194074be762f169fcc25b9ad0d4013905ba0655 (diff) | |
| parent | f1e83a4163458f7e25c709403cc7c7b48a7ef23e (diff) | |
| download | mariadb-git-5f0c09dd7220b7ad5709823788e9289fc94ab8fe.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- include/my_no_pthread.h
- mysql-test/r/sp-ucs2.result
- sql/log.cc
- sql/sql_acl.cc
- sql/sql_yacc.yy
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 55bb3e754de..13fed9e3bce 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -581,6 +581,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; } |