summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorkonstantin@mysql.com <>2004-10-22 14:47:35 +0400
committerkonstantin@mysql.com <>2004-10-22 14:47:35 +0400
commita7c52d755bab03d134637947d29d5c1b0531660e (patch)
treec91f35d8dafca87c0b5c62689189e4641443c49f /sql/sql_class.h
parentb686f98f50564d8562f3370f3b58d0fbb59c6da5 (diff)
downloadmariadb-git-a7c52d755bab03d134637947d29d5c1b0531660e.tar.gz
A fix and test case for Bug#6050 "EXECUTE stmt reports ambiguous field
names with ident. tables fr. diff. schemata": revise all uses of Item_field and make them prepared-statements friendly when necessary.
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index c30e1c321b0..3769ccddec8 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -464,6 +464,8 @@ public:
inline bool is_stmt_prepare() 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; }
inline bool is_conventional_execution() const
{ return state == CONVENTIONAL_EXECUTION; }
inline gptr alloc(unsigned int size) { return alloc_root(&mem_root,size); }