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 /sql/mysqld.h | |
| 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 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 28ac871d858..e771a0c0da2 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -488,6 +488,8 @@ extern pthread_t signal_thread; extern struct st_VioSSLFd * ssl_acceptor_fd; #endif /* HAVE_OPENSSL */ +extern ulonglong my_pcre_frame_size; + /* The following variables were under INNODB_COMPABILITY_HOOKS */ |