diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-06-04 04:08:54 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-06-04 04:08:54 +0300 |
| commit | a86abf586b08de55fd4732853e84d04859e6d981 (patch) | |
| tree | 3f9a808fc0bff58363f39c04cf04203877416b2c /sql | |
| parent | 0de11974be158415ecf8b490f89e98362dcf7700 (diff) | |
| parent | dafc6ba54cecff4e07d31ff36d8a82de2298b1a2 (diff) | |
| download | mariadb-git-a86abf586b08de55fd4732853e84d04859e6d981.tar.gz | |
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_gemini.cc | 5 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
2 files changed, 2 insertions, 5 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> diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 3816d1aaa5c..8de9da444bd 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -88,7 +88,7 @@ int deny_severity = LOG_WARNING; #endif #ifdef _AIX41 -int initgroups(const char *,int); +int initgroups(const char *,unsigned int); #endif #if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) |