Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix and reenable Windows compiler warning C4800 (size_t conversion). | Vladislav Vaintroub | 2018-01-26 | 2 | -4/+4 |
| | |||||
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-24 | 2 | -3/+9 |
|\ | |||||
| * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 2 | -3/+9 |
| |\ | |||||
| | * | MDEV-13412 main.func_regexp_pcre fails in buildbot on ppc64le | Sergei Golubchik | 2017-10-09 | 2 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caused by 2fcd8c12522. It used the documented pcre API -pcre_exec(NULL, NULL, NULL, -999, -999, 0, NULL, 0) to calculate the pcre stack frame size. Unfortunately, modern compilers broke it by cloning and inlining pcre match() function. 2fcd8c12522 tried to workaround it by setting the stack frame size to at least 500. It didn't work, 500 is not a universal constant. Now we fix our copy of pcre to not inline or clone match() - so that stack frame detection would work again - and detect at cmake time whether system pcre is broken or usable. Also use stack, not (much slower) malloc in bundled pcre, unless on Windows | ||||
* | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-09-06 | 2 | -1/+6 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-09-06 | 2 | -1/+6 |
| |\ \ | | |/ | |||||
| | * | Fix compiler warnings | Marko Mäkelä | 2017-09-01 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | metadata_lock_info_duration[]: Remove the unused variable. Add some comments /* fall through */ to silence -Wimplicit-fallthrough | ||||
* | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-08-17 | 31 | -521/+825 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-08-08 | 31 | -521/+825 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'merge-pcre' into 10.0 | Vicențiu Ciorbaru | 2017-07-30 | 31 | -521/+825 |
| | |\ | |||||
| | | * | 8.41 | Vicențiu Ciorbaru | 2017-07-30 | 58 | -3881/+4299 |
| | | | | |||||
* | | | | MDEV-13370 Ambiguous behaviour regarding installation of header files | Sergei Golubchik | 2017-08-14 | 1 | -1/+1 |
|/ / / | | | | | | | | | | | | | install all server includes under /usr/include/mysql/server/ and C/C includes under /usr/include/mysql/ | ||||
* | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 30 | -1166/+1449 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | Also, implement MDEV-11027 a little differently from 5.5 and 10.0: recv_apply_hashed_log_recs(): Change the return type back to void (DB_SUCCESS was always returned). Report progress also via systemd using sd_notifyf(). | ||||
| * | | Merge branch 'merge-pcre' into 10.0 | Vicențiu Ciorbaru | 2017-03-05 | 30 | -1166/+1449 |
| |\ \ | | |/ | |||||
| | * | 8.40 | Vicențiu Ciorbaru | 2017-03-05 | 48 | -1236/+1630 |
| | | | |||||
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 31 | -2141/+3492 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge-pcre' into 10.0 | Sergei Golubchik | 2016-06-21 | 31 | -2141/+3492 |
| |\ \ | | |/ | |||||
| | * | 8.39 | Sergei Golubchik | 2016-06-21 | 58 | -4367/+5786 |
| | | | |||||
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 39 | -1264/+2225 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge/merge-pcre' into 10.0 | Sergei Golubchik | 2015-12-13 | 39 | -1264/+2225 |
| |\ \ | | |/ | |||||
| | * | 8.38 | Sergei Golubchik | 2015-12-13 | 56 | -1646/+2886 |
| | | | |||||
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -5/+0 |
|\ \ \ | |/ / | |||||
| * | | MDEV-8533 Debug embedded server does not build on Windows | Vladislav Vaintroub | 2015-11-09 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pre/CMakeLists.txt defines CMAKE_DEBUG_POSTFIX which causes a different library name on Windows debug build (pcred.lib rather than pre.lib) However MERGE_LIBRARIES macro that is used to create static embedded library (out of other static libraries), can not handle per-configuration library names. Thus the build fails with "pre.lib not found" Fix is to remove unnecessary CMAKE_DEBUG_POSTFIX | ||||
* | | | restore CRLF file ending in the test data | Sergei Golubchik | 2015-09-14 | 1 | -2/+2 |
| | | | |||||
* | | | Fix spelling errors | Otto Kekäläinen | 2015-08-27 | 1 | -1/+1 |
|/ / | |||||
* | | CRLF | Sergei Golubchik | 2015-06-11 | 1 | -616/+616 |
| | | |||||
* | | Merge branch 'merge-pcre' into 10.0 | Sergei Golubchik | 2015-05-04 | 41 | -768/+1695 |
|\ \ | |/ | |||||
| * | 8.37 | Sergei Golubchik | 2015-05-04 | 79 | -7082/+10402 |
| | | |||||
* | | pcre-8.36 | Sergei Golubchik | 2014-11-20 | 50 | -3102/+4194 |
|\ \ | |/ | |||||
| * | 8.36 | Sergei Golubchik | 2014-11-18 | 71 | -4612/+6719 |
| | | |||||
* | | pcre-8.35 | Sergei Golubchik | 2014-06-05 | 79 | -2974/+4679 |
|\ \ | |/ | |||||
| * | pcre-8.35.tar.bz2 | Sergei Golubchik | 2014-06-05 | 107 | -4072/+21415 |
| | | |||||
| * | pcre-8.34 | Sergei Golubchik | 2014-06-05 | 361 | -0/+270599 |
| | |||||
* | remove and ignore generated pcre files | Sergei Golubchik | 2014-06-05 | 3 | -551/+0 |
| | |||||
* | MDEV-6149 Include file pcre.h missing in binary dist, meaing I_S plugins ↵ | Sergei Golubchik | 2014-06-05 | 1 | -0/+2 |
| | | | | | | can't be built when the bundled pcre is used, install its pcre.h in mysql/private/ | ||||
* | merge 10.0-base ->10.0 | unknown | 2014-02-05 | 168 | -6712/+12121 |
|\ | |||||
| * | Upgrading the bundled PCRE to 8.34 | Alexander Barkov | 2014-02-03 | 168 | -6705/+12145 |
| | | |||||
* | | MDEV-5357 REGEXP word boundaries don't work | Alexander Barkov | 2013-12-02 | 2 | -0/+37 |
|/ | | | | | | | Applied a patch from Philip Hazel implementing the non-standard syntax for word boundaries in PCRE, for compatibility with the old Henry Spencer's regex library. | ||||
* | MDEV-4425 Regexp enhancements | Alexander Barkov | 2013-10-11 | 1 | -0/+13 |
| | | | | | | Mark a few PCRE CMake variables as advanced, so the are not presented in cmake-gui by default. | ||||
* | MDEV-4425 Regexp enhancements | Alexander Barkov | 2013-10-04 | 1 | -0/+2 |
| | | | | | | | Fixing compilation failure on Solaris. The int64_t type was not defined because stdint.h was not included due to a missing definition in pcre/config-cmake.h.in. | ||||
* | MDEV-4425 Regexp enhancements | Alexander Barkov | 2013-10-03 | 1 | -2/+2 |
| | | | | | | | | PCRE unit tests failed on Ubuntu Precise, because "source" is not a known command in "dash" (the default shell in Precise). Changing "source" to ".", which should be understood in all shells. | ||||
* | MDEV-4425 REGEXP enhancements | Alexander Barkov | 2013-10-02 | 3 | -0/+10 |
| | | | | | | | | Adding pcre_stack_guard to avoid crashes in pcre_compile() on a long recursive patterns with parenthesizes: SELECT a RLIKE '((((...((((x)))...))))'; | ||||
* | MDEV-4425 Regexp enhancements | Alexander Barkov | 2013-10-02 | 1 | -663/+0 |
| | | | | | Removing pcre.h from the tree, it's generated from pcre.h.in | ||||
* | MDEV-4424 Regexp enhancements | Alexander Barkov | 2013-10-02 | 1 | -23/+29 |
| | | | | | | - Commenting out unused instructions in pcre/CMakeLists.txt - Don't print PCRE configuration status by default. | ||||
* | pcre: removing CMake-2.8 requirement. | Alexander Barkov | 2013-10-01 | 1 | -4/+0 |
| | | | | | It seems to compile/work fine with CMake-2.6. | ||||
* | pcre: fixing linking error one some systems: | Alexander Barkov | 2013-09-30 | 1 | -2/+2 |
| | | | | | | | | | | libmysqld.a(pcre_exec.c.o): relocation R_X86_64_32S against `_pcre_ucd_stage1' can not be used when making a shared object; make[2]: Leaving directory `/mnt/buildbot/build/mariadb-10.0.3' recompile with -fPIC Changing ADD_LIBRARY(pcre) to ADD_CONVENIENCE_LIBRARY(pcre) | ||||
* | Removing configuration switches that are not needed for MariaDB | Alexander Barkov | 2013-09-27 | 1 | -394/+11 |
| | | | | | from pcre/CMakeLists.txt | ||||
* | pcre: | Alexander Barkov | 2013-09-27 | 1 | -113/+0 |
| | | | | | | - do not install anything from pcre library - do not build the c++ library | ||||
* | pcre: Removing config.h from the tree, it's a generated file. | Alexander Barkov | 2013-09-27 | 1 | -54/+0 |
| | |||||
* | MDEV-4425 REGEXP enhancements | Alexander Barkov | 2013-09-26 | 307 | -0/+191241 |