Netware specific changes.
sql/ha_archive.cc: Disabled archive db for Netware until zlibCompileFlags() is available for this platform. sql/sql_string.h: Added casts. Won't work with Metrowerks compiler without.
This commit is contained in:
parent
67183a7b8a
commit
4e1d88af8f
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
#include "mysql_priv.h"
|
#include "mysql_priv.h"
|
||||||
|
|
||||||
#ifdef HAVE_ARCHIVE_DB
|
#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)
|
||||||
#include "ha_archive.h"
|
#include "ha_archive.h"
|
||||||
#include <my_dir.h>
|
#include <my_dir.h>
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
#define NOT_FIXED_DEC 31
|
#define NOT_FIXED_DEC 31
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define STRING_WITH_LEN(X) ((char*) X), (sizeof(X)-1)
|
#define STRING_WITH_LEN(X) ((const char*) X), ((uint) (sizeof(X) - 1))
|
||||||
|
|
||||||
class String;
|
class String;
|
||||||
int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);
|
int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user