diff options
| author | monty@hundin.mysql.fi <> | 2001-10-08 04:58:07 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-10-08 04:58:07 +0300 |
| commit | 88aff4bf851e8f0d67cc7cd860d445e0fb234717 (patch) | |
| tree | f8a3cf3164d5a5550378074ac8d3bf4afe105683 /sql/ha_isammrg.cc | |
| parent | e80123501939a6e19dcc33efa837c15f5ca60641 (diff) | |
| download | mariadb-git-88aff4bf851e8f0d67cc7cd860d445e0fb234717.tar.gz | |
Updated manual about embedded version.
Speed up column-completion in 'mysql'
Don't use ISAM if HAVE_ISAM is not defined
A lot of fixes for the embedded version. All libraries are now included in libmysqld.a
Changed arguments to convert_dirname() to make it more general.
Renamed files in the 'merge' directory to all use a common prefix.
Don't compile both assembler and C functions on x86
Diffstat (limited to 'sql/ha_isammrg.cc')
| -rw-r--r-- | sql/ha_isammrg.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/ha_isammrg.cc b/sql/ha_isammrg.cc index dd2e4e2f723..41fb99fe867 100644 --- a/sql/ha_isammrg.cc +++ b/sql/ha_isammrg.cc @@ -20,11 +20,12 @@ #endif #include "mysql_priv.h" +#ifdef HAVE_ISAM #include <m_ctype.h> #ifndef MASTER -#include "../srclib/merge/mrgdef.h" +#include "../srclib/merge/mrg_def.h" #else -#include "../merge/mrgdef.h" +#include "../merge/mrg_def.h" #endif #include "ha_isammrg.h" @@ -208,3 +209,4 @@ int ha_isammrg::create(const char *name, register TABLE *form, char buff[FN_REFLEN]; return mrg_create(fn_format(buff,name,"","",2+4+16),0); } +#endif /* HAVE_ISAM */ |