mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 03:47:17 +02:00
Merge from 4.1
Archive fix by Ingo. Innodb compile fix by Monty. configure.in: Auto merged innobase/include/univ.i: Auto merged BUILD/SETUP.sh: Auto merged mysql-test/t/archive.test: Auto merged sql/examples/ha_archive.cc: Auto merged sql/examples/ha_archive.h: Auto merged sql/handler.cc: Auto merged sql/sql_select.cc: Auto merged innobase/fil/fil0fil.c: Merged Montys fix.
This commit is contained in:
commit
01e8459895
8 changed files with 74 additions and 25 deletions
|
|
@ -80,6 +80,10 @@ memory is read outside the allocated blocks. */
|
|||
|
||||
/* Make a non-inline debug version */
|
||||
|
||||
#ifdef DBUG_ON
|
||||
#define UNIV_DEBUG
|
||||
#endif /* DBUG_ON */
|
||||
|
||||
/*
|
||||
#define UNIV_DEBUG
|
||||
#define UNIV_MEM_DEBUG
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue