diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2017-11-23 18:57:26 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2017-11-23 19:41:44 +0300 |
| commit | 6e0b2c7fe027a897688c729b55a08e748817cef0 (patch) | |
| tree | 98ca98e5c0b307c4a0dfe7a55623fe46d4ab35c7 /include/m_string.h | |
| parent | cbe93291e4391dc5788c022e92d1baf17ca33625 (diff) | |
| parent | 1773116fe03e893a74af2d35038470d3033054f2 (diff) | |
| download | mariadb-git-6e0b2c7fe027a897688c729b55a08e748817cef0.tar.gz | |
System Versioning 1.0pre2
Merge branch '10.3' into trunk
Diffstat (limited to 'include/m_string.h')
| -rw-r--r-- | include/m_string.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/m_string.h b/include/m_string.h index 1889d177911..52640cfe6b5 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -22,7 +22,6 @@ #ifndef _m_string_h #define _m_string_h -#include "my_global.h" /* HAVE_* */ #include "my_decimal_limits.h" #ifndef __USE_GNU |