~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to storage/falcon/Log.cpp

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
52
52
#endif
53
53
 
54
54
 
55
 
#ifdef _WIN32
56
 
#define vsnprintf       _vsnprintf
57
 
#endif
58
 
 
59
55
#ifndef ASSERT
60
56
#define ASSERT
61
57
#endif