diff options
| author | unknown <monty@mysql.com> | 2004-06-28 00:42:02 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-06-28 00:42:02 +0300 |
| commit | 6cf309222455818c0a6c13dffff5da7f6419910a (patch) | |
| tree | 954fa8b91cc81036542a5044308f8e97a192170a /include | |
| parent | f90b266fa555d29f0606c641516f5192a1697555 (diff) | |
| download | mariadb-git-6cf309222455818c0a6c13dffff5da7f6419910a.tar.gz | |
Added missing my_time.c file to mysqlclient project
Moved include <assert.h> to my_global.h
VC++Files/client/mysqlclient.dsp:
Added missing my_time.c file to mysqlclient project
include/my_dbug.h:
Moved include <assert.h> to my_global.h
Removed NDEBUG as asserts should be indenpendent of if we are using DBUG or not
include/my_global.h:
Added assert.h as this is included in a lot of places
sql/sql_table.cc:
Initialize forgotten variable
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_dbug.h | 5 | ||||
| -rw-r--r-- | include/my_global.h | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/include/my_dbug.h b/include/my_dbug.h index bc90b91f1c7..9174a8b1ef9 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -16,10 +16,7 @@ #ifndef _dbug_h #define _dbug_h -#ifdef DBUG_OFF -#define NDEBUG /* for assert.h */ -#endif -#include <assert.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/include/my_global.h b/include/my_global.h index 478bfcfdbb7..f5c14ea3e10 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -313,6 +313,13 @@ C_MODE_END #include <crypt.h> #endif +/* + A lot of our programs uses asserts, so better to always include it + This also fixes a problem when people uses DBUG_ASSERT without including + assert.h +*/ +#include <assert.h> + /* Go around some bugs in different OS and compilers */ #if defined(_HPUX_SOURCE) && defined(HAVE_SYS_STREAM_H) #include <sys/stream.h> /* HPUX 10.20 defines ulong here. UGLY !!! */ |