diff options
| author | monty@hundin.mysql.fi <> | 2001-08-30 01:22:02 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-08-30 01:22:02 +0300 |
| commit | 3fb423fe3996742f46fafb80be3355a8509e70dd (patch) | |
| tree | 0333b688453602a24b5a46133bd78136de042d90 /sql/mini_client.cc | |
| parent | f5b700ad6444a445b95dfdd28a32778710e9b41f (diff) | |
| download | mariadb-git-3fb423fe3996742f46fafb80be3355a8509e70dd.tar.gz | |
Fix for OS2
Diffstat (limited to 'sql/mini_client.cc')
| -rw-r--r-- | sql/mini_client.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/mini_client.cc b/sql/mini_client.cc index 3a2305aa69c..fe8a0a161b3 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -52,6 +52,11 @@ inline int local_thr_alarm(my_bool *A,int B __attribute__((unused)),ALARM *C __a #include "errmsg.h" #include <violite.h> +#if defined( OS2) && defined( MYSQL_SERVER) +#undef ER +#define ER CER +#endif + extern ulong net_read_timeout; extern "C" { // Because of SCO 3.2V4.2 |