mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
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
This commit is contained in:
parent
f90b266fa5
commit
6cf3092224
4 changed files with 13 additions and 4 deletions
|
@ -435,6 +435,10 @@ SOURCE=..\mysys\my_tempnam.c
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\libmysql\my_time.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\mysys\my_thr_init.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 !!! */
|
||||
|
|
|
@ -3408,6 +3408,7 @@ int mysql_recreate_table(THD *thd, TABLE_LIST *table_list,
|
|||
lex->key_list.empty();
|
||||
lex->col_list.empty();
|
||||
lex->alter_info.reset();
|
||||
lex->alter_info.is_simple= 0; // Force full recreate
|
||||
bzero((char*) &create_info,sizeof(create_info));
|
||||
create_info.db_type=DB_TYPE_DEFAULT;
|
||||
create_info.row_type=ROW_TYPE_DEFAULT;
|
||||
|
|
Loading…
Reference in a new issue