diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
| commit | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch) | |
| tree | bdf0738c29dc1f57fbfba3a1754524e238f15b52 /sql/create_options.h | |
| parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
| download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz | |
lots of post-merge changes
Diffstat (limited to 'sql/create_options.h')
| -rw-r--r-- | sql/create_options.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/create_options.h b/sql/create_options.h index b66bbf43570..1bd6ecd81e6 100644 --- a/sql/create_options.h +++ b/sql/create_options.h @@ -22,7 +22,8 @@ #ifndef SQL_CREATE_OPTIONS_INCLUDED #define SQL_CREATE_OPTIONS_INCLUDED -#include "handler.h" +#include "sql_class.h" +//#include "handler.h" class engine_option_value: public Sql_alloc { |