diff options
| author | monty@hundin.mysql.fi <> | 2002-08-21 22:04:22 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-08-21 22:04:22 +0300 |
| commit | 03b0179af9f3492c4682dbc85542529215010a7c (patch) | |
| tree | 75f29bea26c7fd21a45f22fd906c7a1545aaee91 /include | |
| parent | a5edb200421018ee967045903b2802c2d5c1bd75 (diff) | |
| download | mariadb-git-03b0179af9f3492c4682dbc85542529215010a7c.tar.gz | |
Use our version of RWLOCKS on UNIXWARE 7
More DBUG info for replication
Better error messages from replication
Fixed bug in replication code when connecting to 'localhost' (time was not released properly)
Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug)
Removed warning when setting an AUTO_INCREMENT field to NULL
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 6 | ||||
| -rw-r--r-- | include/mysql_version.h.in | 2 | ||||
| -rw-r--r-- | include/mysqld_error.h | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index aac0222c136..9b7812b7cf2 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -487,6 +487,12 @@ int safe_cond_timedwait(pthread_cond_t *cond, safe_mutex_t *mp, /* READ-WRITE thread locking */ +#ifdef HAVE_BROKEN_RWLOCK /* For OpenUnix */ +#undef HAVE_PTHREAD_RWLOCK_RDLOCK +#undef HAVE_RWLOCK_INIT +#undef HAVE_RWLOCK_T +#endif + #if defined(USE_MUTEX_INSTEAD_OF_RW_LOCKS) /* use these defs for simple mutex locking */ #define rw_lock_t pthread_mutex_t diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in index 1eb6f253d74..793bf36e9fe 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -10,7 +10,9 @@ #else #define PROTOCOL_VERSION @PROTOCOL_VERSION@ #define MYSQL_SERVER_VERSION "@VERSION@" +#ifndef MYSQL_SERVER_SUFFIX #define MYSQL_SERVER_SUFFIX "@MYSQL_SERVER_SUFFIX@" +#endif #define FRM_VER @DOT_FRM_VERSION@ #define MYSQL_VERSION_ID @MYSQL_VERSION_ID@ #define MYSQL_PORT @MYSQL_TCP_PORT@ diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 9f0ea9d7988..0898b3d576f 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -252,4 +252,5 @@ #define ER_VAR_CANT_BE_READ 1233 #define ER_CANT_USE_OPTION_HERE 1234 #define ER_NOT_SUPPORTED_YET 1235 -#define ER_ERROR_MESSAGES 236 +#define ER_MASTER_FATAL_ERROR_READING_BINLOG 1236 +#define ER_ERROR_MESSAGES 237 |