Markus Makela 32575e3fc0 Merge branch 'develop' into shm_log_fix ...

Conflicts:
	log_manager/log_manager.cc

2014-10-15 21:26:03 +03:00

..

test

Updated the licensing year from 2013 to 2013-2014

2014-10-01 14:37:12 +03:00

CMakeLists.txt

Changed the order of linking to resolve some debug build bugs and added the missing parent directory of the MYSQL_DIR into the included directories.

2014-09-20 19:44:30 +03:00

log_manager.cc

Merge branch 'develop' into shm_log_fix

2014-10-15 21:26:03 +03:00

log_manager.h

Updated the licensing year from 2013 to 2013-2014

2014-10-01 14:37:12 +03:00

makefile

Removed the debug tags from log entries in standard debug builds and added a special switch to the tests

2014-09-10 13:00:28 +03:00