database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix for OS2

Browse Source
This commit is contained in:
monty@hundin.mysql.fi
2001-08-30 01:22:02 +03:00
parent f5b700ad64
commit 3fb423fe39
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Docs/manual.texi
View File

@ -34159,7 +34159,7 @@ if no @code{PRIMARY KEY} was specified explicitly.)
@findex UNIQUE @findex UNIQUE
@findex PRIMARY KEY @findex PRIMARY KEY
If you add a @code{UNIQUE INDEX} or @code{PRIMARY KEY} to a table, this If you add a @code{UNIQUE INDEX} or @code{PRIMARY KEY} to a table, this
is stored before any not @code[UNIQUE} index so that MySQL can detect is stored before any not @code{UNIQUE} index so that MySQL can detect
duplicate keys as early as possible. duplicate keys as early as possible.
@findex ORDER BY @findex ORDER BY

5
include/errmsg.h
View File

@ -29,8 +29,11 @@ extern const char *client_errors[]; /* Error messages */
#define CR_MIN_ERROR 2000 /* For easier client code */ #define CR_MIN_ERROR 2000 /* For easier client code */
#define CR_MAX_ERROR 2999 #define CR_MAX_ERROR 2999
#undef ER #if defined(OS2) && defined( MYSQL_SERVER)
#define CER(X) client_errors[(X)-CR_MIN_ERROR]
#else
#define ER(X) client_errors[(X)-CR_MIN_ERROR] #define ER(X) client_errors[(X)-CR_MIN_ERROR]
#endif
#define CLIENT_ERRMAP 2 /* Errormap used by my_error() */ #define CLIENT_ERRMAP 2 /* Errormap used by my_error() */
#define CR_UNKNOWN_ERROR 2000 #define CR_UNKNOWN_ERROR 2000

4
include/m_string.h
View File

@ -82,7 +82,7 @@
# define bmove_allign(A,B,C) memcpy((A),(B),(C)) # define bmove_allign(A,B,C) memcpy((A),(B),(C))
#endif #endif
#ifdef __cplusplus #if defined(__cplusplus) && !defined(OS2)
extern "C" { extern "C" {
#endif #endif
@ -238,7 +238,7 @@ extern ulonglong strtoull(const char *str, char **ptr, int base);
#endif #endif
#endif #endif
#ifdef __cplusplus #if defined(__cplusplus) && !defined(OS2)
} }
#endif #endif
#endif #endif

2
os2/MySQL-Sql.icc
View File

@ -81,7 +81,7 @@ option ProjectOptions = MySQLOptions
// target source files // target source files
source "rint.obj" source "rint.obj"
source zlib, ufc, regex source zlib, ufc, regex, 'strings\bmove_upp.c'
if debug_build { if debug_build {
source type('cpp') dbug source type('cpp') dbug
} }

5
sql/mini_client.cc
View File

@ -52,6 +52,11 @@ inline int local_thr_alarm(my_bool *A,int B __attribute__((unused)),ALARM *C __a
#include "errmsg.h" #include "errmsg.h"
#include <violite.h> #include <violite.h>
#if defined( OS2) && defined( MYSQL_SERVER)
#undef ER
#define ER CER
#endif
extern ulong net_read_timeout; extern ulong net_read_timeout;
extern "C" { // Because of SCO 3.2V4.2 extern "C" { // Because of SCO 3.2V4.2