diff options
| author | unknown <serg@serg.mylan> | 2005-04-05 13:23:11 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-04-05 13:23:11 +0200 |
| commit | 46aad9633e9ca7637c5e1733a8ed13b0e251d24a (patch) | |
| tree | 0a56278a2020f2d1a62f4609954f3e92e90ae0dc /sql/sql_base.cc | |
| parent | b419262fe49bb3cc84f496e913edd3f1baf25283 (diff) | |
| parent | cd0a50bf34477bf547cc4a66f0d5d9651574a65b (diff) | |
| download | mariadb-git-46aad9633e9ca7637c5e1733a8ed13b0e251d24a.tar.gz | |
Merge
sql/field.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/handler.cc:
SCCS merged
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 736b372cc8f..145244f1c02 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -25,7 +25,6 @@ #include <m_ctype.h> #include <my_dir.h> #include <hash.h> -#include <nisam.h> #ifdef __WIN__ #include <io.h> #endif |