diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-03-14 15:36:11 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-03-14 15:36:11 -0600 |
| commit | 34a0de585afdfd4ee62f880387730f00394666f4 (patch) | |
| tree | 4cfbf7f3bbb30d7fad0e2abfd590ae5a06fdcd3f /sql/sp_head.h | |
| parent | fa57a563ce66f4b024da4b50ea4109bf0d45e202 (diff) | |
| parent | cfcd27b3db1459c11e89ca21510438ac9ee55747 (diff) | |
| download | mariadb-git-34a0de585afdfd4ee62f880387730f00394666f4.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.1-26503-merge
mysql-test/t/sp-error.test:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index 1776d81b248..19dc2dac476 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -107,8 +107,6 @@ public: /* Possible values of m_flags */ enum { HAS_RETURN= 1, // For FUNCTIONs only: is set if has RETURN - IN_SIMPLE_CASE= 2, // Is set if parsing a simple CASE - IN_HANDLER= 4, // Is set if the parser is in a handler body MULTI_RESULTS= 8, // Is set if a procedure with SELECT(s) CONTAINS_DYNAMIC_SQL= 16, // Is set if a procedure with PREPARE/EXECUTE IS_INVOKED= 32, // Is set if this sp_head is being used |