database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.0 into 10.1

Browse Source
This commit is contained in:
Marko Mäkelä
2017-05-19 08:53:58 +03:00
parent d0eb4ee96b 54bb04f7ef
commit 13a350ac29
75 changed files with 830 additions and 790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/mysqld.h
View File

@ -522,6 +522,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
*/