← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to storage/falcon/JString.cpp

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/falcon/JString.cpp
28
28
#include "Engine.h"
29
29
#include "Unicode.h"
30
30
 
31
 
#ifdef _WIN32
32
 
#define vsnprintf       _vsnprintf
33
 
#endif
34
31
 
35
32
#ifndef ASSERT
36
33
#define ASSERT(expr)