diff options
| author | unknown <evgen@moonbone.local> | 2006-08-02 16:10:52 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-08-02 16:10:52 +0400 |
| commit | 84ece59cefafc7a223c65aa7c763f5e72afaa1fc (patch) | |
| tree | 815f8e314c308891d6af810de25b3ab937197f7c /sql/mysql_priv.h | |
| parent | 66716f0984ca5d00896609ce3003b515242180ba (diff) | |
| parent | 9c7a329ebac9ae1da05e0c427d1f46094c2c8b7e (diff) | |
| download | mariadb-git-84ece59cefafc7a223c65aa7c763f5e72afaa1fc.tar.gz | |
Merge moonbone.local:/work/tmp_merge-4.1
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index b9faa062850..9c5bcc2d53f 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -387,8 +387,9 @@ enum enum_var_type OPT_DEFAULT, OPT_SESSION, OPT_GLOBAL }; class sys_var; -#include "item.h" +class Comp_creator; typedef Comp_creator* (*chooser_compare_func_creator)(bool invert); +#include "item.h" /* sql_parse.cc */ void free_items(Item *item); void cleanup_items(Item *item); |