diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-19 16:09:44 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-19 16:09:44 +0400 |
| commit | fa3b2dcb838a05f5c07b78c2fc518018c473a47f (patch) | |
| tree | b055b8d1c4471f9f8daad623d14e1af7b793f04c /sql/procedure.h | |
| parent | 199f2ce47eb508aa62e9b2fcf80c6536cb14f4f5 (diff) | |
| parent | fe0828b3b8193e086abe740572c9b0cb2b7da671 (diff) | |
| download | mariadb-git-fa3b2dcb838a05f5c07b78c2fc518018c473a47f.tar.gz | |
Manual merge of mysql-5.1-bugteam to
mysql-trunk-merge.
Conflicts:
Text conflict in sql/sql_priv.h
Diffstat (limited to 'sql/procedure.h')
| -rw-r--r-- | sql/procedure.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/procedure.h b/sql/procedure.h index 25b30ac593d..f34eb228f28 100644 --- a/sql/procedure.h +++ b/sql/procedure.h @@ -23,6 +23,14 @@ #pragma interface /* gcc class implementation */ #endif +/* + It is necessary to include set_var.h instead of item.h because there + are dependencies on include order for set_var.h and item.h. This + will be resolved later. +*/ +#include "sql_class.h" /* select_result, set_var.h: THD */ +#include "set_var.h" /* Item */ + #define PROC_NO_SORT 1 /**< Bits in flags */ #define PROC_GROUP 2 /**< proc must have group */ |