diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-05-11 19:48:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-05-15 22:23:10 +0200 |
| commit | 52aa200919b1fd9357c05bcdfc66a42e51f242b3 (patch) | |
| tree | 7c3c15b54110084a64e6f5f07e70de3016b1b6ae /mysys/my_init.c | |
| parent | 602b5e4c498ad2e2d045adfa4fd1478ac437582a (diff) | |
| download | mariadb-git-52aa200919b1fd9357c05bcdfc66a42e51f242b3.tar.gz | |
MDEV-12420 max_recursive_iterations did not prevent a stack-overflow and segfault
post-review fixes
* move pcre-specific variable out of mysys
* don't use current_thd
* move a commonly used macro to my_sys.h
* remove new sysvar
Diffstat (limited to 'mysys/my_init.c')
| -rw-r--r-- | mysys/my_init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index 206f96827c3..dee41e1202a 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -45,8 +45,6 @@ my_bool my_init_done= 0; uint mysys_usage_id= 0; /* Incremented for each my_init() */ ulonglong my_thread_stack_size= (sizeof(void*) <= 4)? 65536: ((256-16)*1024); -/* http://pcre.org/original/doc/html/pcrestack.html - replaced by init_pcre value */ -ulonglong my_pcre_frame_size= 640 + 16; static ulong atoi_octal(const char *str) { |