diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-01-30 16:43:23 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-01-30 16:43:23 +0200 |
| commit | 2e75dda33ebc7468f777f55e403c1d40a00ec0e0 (patch) | |
| tree | b9ebb0c9950f8fa52958d1198e6df31c21cee7a3 /strings/r_strinstr.c | |
| parent | 4e17ec5a298b118e7f86df8d470abf06d3d5dbad (diff) | |
| parent | 5bcf3a242c753449dde504a1a27712ad48b3ed8c (diff) | |
| download | mariadb-git-2e75dda33ebc7468f777f55e403c1d40a00ec0e0.tar.gz | |
Merge with 5.1
Fixed a couple of compilation failures that was not detected before merge.
Diffstat (limited to 'strings/r_strinstr.c')
| -rw-r--r-- | strings/r_strinstr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/strings/r_strinstr.c b/strings/r_strinstr.c index fb1e0c5a090..e342f72ed52 100644 --- a/strings/r_strinstr.c +++ b/strings/r_strinstr.c @@ -22,8 +22,7 @@ the pattern counted from the begining of the string. */ -#include <my_global.h> -#include "m_string.h" +#include "strings_def.h" size_t r_strinstr(reg1 const char * str, size_t from, reg4 const char * search) { |