Commit graph

24 commits

Author SHA1 Message Date
Oleksandr Byelkin
d233fd14a3 Merge branch 'merge-pcre' into 10.1 2020-04-30 21:27:32 +02:00
Oleksandr Byelkin
c1291d7a6b 8.44 2020-04-30 18:40:02 +02:00
Sergei Golubchik
52eb4f172c Merge branch 'merge-pcre' into 10.1 2019-04-26 16:11:55 +02:00
Sergei Golubchik
879f7e85aa 8.43 2019-04-26 12:25:09 +02:00
Sergei Golubchik
9989c26bc9 Merge branch '10.0' into 10.1 2018-05-05 14:01:59 +02:00
Sergei Golubchik
48636f0972 Merge branch 'merge-pcre' into 10.0 2018-04-26 14:16:31 +02:00
Sergei Golubchik
cf242aded5 8.42 2018-04-24 19:08:50 +02:00
Sergei Golubchik
8e8d42ddf0 Merge branch '10.0' into 10.1 2017-08-08 10:18:43 +02:00
Vicențiu Ciorbaru
f8736063de Merge branch 'merge-pcre' into 10.0 2017-07-30 11:58:56 +03:00
Vicențiu Ciorbaru
dba454ef54 8.41 2017-07-30 11:53:36 +03:00
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
e7591a1ba9 8.38 2015-12-13 10:14:29 +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
c4cc91cdc9 8.37 2015-05-04 22:19:22 +02:00
Sergei Golubchik
553b437d38 8.36 2014-11-18 18:07:55 +01: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