Merge branch 'bb-10.1-serg' into 10.1

This commit is contained in:
Sergei Golubchik 2015-06-28 15:23:33 +02:00
commit e04f6e7e3a
446 changed files with 7842 additions and 4999 deletions

View file

@ -1576,6 +1576,10 @@ class Regexp_processor_pcre
int m_pcre_exec_rc;
int m_SubStrVec[30];
uint m_subpatterns_needed;
void pcre_exec_warn(int rc) const;
int pcre_exec_with_warn(const pcre *code, const pcre_extra *extra,
const char *subject, int length, int startoffset,
int options, int *ovector, int ovecsize);
public:
String *convert_if_needed(String *src, String *converter);
String subject_converter;