diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-11-19 15:52:14 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-11-19 15:52:14 +0100 |
| commit | beded7d9c9592ca8fdfc367f7c64f89c35995c44 (patch) | |
| tree | a215a54ed5043bb17fe7d69a69439e05b21682d5 /sql/sql_base.h | |
| parent | af71da5d2f90c82b2357e808640003907c488bc2 (diff) | |
| parent | 2553f143fdeb9068eb02a8fda58750c24071f5ef (diff) | |
| download | mariadb-git-beded7d9c9592ca8fdfc367f7c64f89c35995c44.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/sql_base.h')
| -rw-r--r-- | sql/sql_base.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h index 1c0029d9692..3a23e2ea218 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -16,7 +16,6 @@ #ifndef SQL_BASE_INCLUDED #define SQL_BASE_INCLUDED -#include "unireg.h" // REQUIRED: for other includes #include "sql_trigger.h" /* trg_event_type */ #include "sql_class.h" /* enum_mark_columns */ #include "mysqld.h" /* key_map */ |