summaryrefslogtreecommitdiff
path: root/regex/my_regex.h
diff options
context:
space:
mode:
authorNeeraj Bisht <neeraj.x.bisht@oracle.com>2013-01-14 14:59:48 +0530
committerNeeraj Bisht <neeraj.x.bisht@oracle.com>2013-01-14 14:59:48 +0530
commit99645e5be59145bcab2fe36aefde4224e6e69961 (patch)
tree0b998acedd66459a904e80d06ccf91edbeef36ca /regex/my_regex.h
parent54c47527e25f7ebe8c0d995b4a9a1bea901047a9 (diff)
downloadmariadb-git-99645e5be59145bcab2fe36aefde4224e6e69961.tar.gz
BUG#14303860 - EXECUTING A SELECT QUERY WITH TOO
MANY WILDCARDS CAUSES A SEGFAULT Back port from 5.6 and trunk
Diffstat (limited to 'regex/my_regex.h')
-rw-r--r--regex/my_regex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/regex/my_regex.h b/regex/my_regex.h
index 30896e29b91..1f96b8c461e 100644
--- a/regex/my_regex.h
+++ b/regex/my_regex.h
@@ -28,7 +28,7 @@ typedef struct {
/* === regcomp.c === */
-typedef int (*my_regex_stack_check_t)();
+typedef int (*my_regex_stack_check_t)(int);
extern int my_regcomp(my_regex_t *, const char *, int, CHARSET_INFO *charset);
#define REG_BASIC 0000
#define REG_EXTENDED 0001