diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-06-04 17:34:11 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-06-04 17:34:11 -0600 |
| commit | fdff9c0a4521e4006eb7dd718e19077afe6fbb37 (patch) | |
| tree | 4a4e924d33acb60a72c034f4b7ff58112c07d6dd /sql/ha_gemini.cc | |
| parent | 1da42e7b8a4219827f4f435d837f41b1b1919d51 (diff) | |
| parent | 2197533b9b04a76f275e23a24449687089a1c528 (diff) | |
| download | mariadb-git-fdff9c0a4521e4006eb7dd718e19077afe6fbb37.tar.gz | |
Merge mysql.sashanet.com:/home/sasha/src/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysys/tree.c:
Auto merged
sql-bench/bench-init.pl.sh:
Auto merged
sql-bench/server-cfg.sh:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/ha_gemini.cc')
| -rw-r--r-- | sql/ha_gemini.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/ha_gemini.cc b/sql/ha_gemini.cc index 733f0aa3a7d..c95a348f238 100644 --- a/sql/ha_gemini.cc +++ b/sql/ha_gemini.cc @@ -19,11 +19,7 @@ #pragma implementation // gcc: Class implementation #endif -#include <string.h> - #include "mysql_priv.h" -#include "my_pthread.h" - #ifdef HAVE_GEMINI_DB #include "ha_gemini.h" #include "dbconfig.h" @@ -33,6 +29,7 @@ #include <m_ctype.h> #include <myisampack.h> +#include <m_string.h> #include <assert.h> #include <hash.h> #include <stdarg.h> |