Commit graph

38 commits

Author SHA1 Message Date
Marko Mäkelä
ad0c218a44 Merge 10.0 into 10.1
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().
2017-03-09 08:53:08 +02:00
Vicențiu Ciorbaru
1cac281ebe Merge branch 'merge-pcre' into 10.0 2017-03-05 02:44:39 +02:00
Vicențiu Ciorbaru
dfd7749120 8.40 2017-03-05 02:27:59 +02:00
Sergei Golubchik
3361aee591 Merge branch '10.0' into 10.1 2016-06-28 22:01:55 +02:00
Sergei Golubchik
b760a69e1a Merge branch 'merge-pcre' into 10.0 2016-06-21 16:44:03 +02:00
Sergei Golubchik
1592fbd332 8.39 2016-06-21 16:02:35 +02:00
Sergei Golubchik
a2bcee626d Merge branch '10.0' into 10.1 2015-12-21 21:24:22 +01:00
Sergei Golubchik
095b7b92d1 Merge branch 'merge/merge-pcre' into 10.0 2015-12-13 16:25:57 +01:00
Sergei Golubchik
e7591a1ba9 8.38 2015-12-13 10:14:29 +01:00
Sergei Golubchik
beded7d9c9 Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
Vladislav Vaintroub
1694d81399 MDEV-8533 Debug embedded server does not build on Windows
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
2015-11-09 12:29:26 +01:00
Sergei Golubchik
5448df084b restore CRLF file ending in the test data 2015-09-14 12:02:20 +02:00
Otto Kekäläinen
a273f016a1 Fix spelling errors 2015-08-27 00:39:44 +03:00
Sergei Golubchik
b9eb7f12db CRLF 2015-06-11 20:20:52 +02:00
Sergei Golubchik
0b4f5060bb Merge branch 'merge-pcre' into 10.0 2015-05-04 22:25:57 +02:00
Sergei Golubchik
c4cc91cdc9 8.37 2015-05-04 22:19:22 +02:00
Sergei Golubchik
722dc78de4 pcre-8.36 2014-11-20 17:09:51 +01:00
Sergei Golubchik
553b437d38 8.36 2014-11-18 18:07:55 +01:00
Sergei Golubchik
2a5905141a pcre-8.35 2014-06-05 16:05:08 +02:00
Sergei Golubchik
c9c9f5133f remove and ignore generated pcre files 2014-06-05 16:01:27 +02:00
Sergei Golubchik
29065d502a MDEV-6149 Include file pcre.h missing in binary dist, meaing I_S plugins can't be built
when the bundled pcre is used, install its pcre.h in mysql/private/
2014-06-05 15:59:25 +02:00
Sergei Golubchik
8cc5973f1a pcre-8.35.tar.bz2 2014-06-05 13:44:44 +02:00
Sergei Golubchik
8958f8b823 pcre-8.34 2014-06-05 12:47:55 +02:00
unknown
52311b72e6 merge 10.0-base ->10.0 2014-02-05 20:35:11 +02:00
Alexander Barkov
74cca64155 Upgrading the bundled PCRE to 8.34 2014-02-03 08:54:12 +04:00
Alexander Barkov
5bb01fa1ac MDEV-5357 REGEXP word boundaries don't work
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.
2013-12-02 14:39:08 +04:00
Alexander Barkov
032dc20541 MDEV-4425 Regexp enhancements
Mark a few PCRE CMake variables as advanced,
so the are not presented in cmake-gui by default.
2013-10-11 08:52:24 +04:00
Alexander Barkov
43c09c15ff MDEV-4425 Regexp enhancements
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.
2013-10-04 09:57:30 +04:00
Alexander Barkov
f37e0a885a MDEV-4425 Regexp enhancements
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.
2013-10-03 10:58:41 +04:00
Alexander Barkov
fcf992ba4c MDEV-4425 REGEXP enhancements
Adding pcre_stack_guard to avoid crashes in pcre_compile()
on a long recursive patterns with parenthesizes:

SELECT a RLIKE '((((...((((x)))...))))';
2013-10-02 11:58:29 +04:00
Alexander Barkov
d83648f25a MDEV-4425 Regexp enhancements
Removing pcre.h from the tree, it's generated from pcre.h.in
2013-10-02 10:07:24 +04:00
Alexander Barkov
bf41088491 MDEV-4424 Regexp enhancements
- Commenting out unused instructions in pcre/CMakeLists.txt
- Don't print PCRE configuration status by default.
2013-10-02 09:55:57 +04:00
Alexander Barkov
ccb1344fe9 pcre: removing CMake-2.8 requirement.
It seems to compile/work fine with CMake-2.6.
2013-10-01 12:26:34 +04:00
Alexander Barkov
61a1c03694 pcre: fixing linking error one some systems:
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)
2013-09-30 11:29:32 +04:00
Alexander Barkov
d88c752612 Removing configuration switches that are not needed for MariaDB
from pcre/CMakeLists.txt
2013-09-27 18:13:46 +04:00
Alexander Barkov
69a641a500 pcre:
- do not install anything from pcre library
- do not build the c++ library
2013-09-27 17:04:30 +04:00
Alexander Barkov
90b8fee692 pcre: Removing config.h from the tree, it's a generated file. 2013-09-27 14:26:52 +04:00
Alexander Barkov
285e7aa179 MDEV-4425 REGEXP enhancements 2013-09-26 18:02:17 +04:00