MDEV-14024 PCRE2.

Related changes in the server code.

CMakeLists.txt

@@ -350,7 +350,7 @@ IF(NOT HAVE_CXX_NEW)
 ENDIF()
 
 # Find header files from the bundled libraries
-# (wolfssl, readline, pcre, etc)
+# (wolfssl, readline, pcre2, etc)
 # before the ones installed in the system
 SET(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 

client/CMakeLists.txt

@@ -46,7 +46,7 @@ ENDIF(UNIX)
 
 MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
 SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
-TARGET_LINK_LIBRARIES(mysqltest  ${CLIENT_LIB} pcreposix pcre)
+TARGET_LINK_LIBRARIES(mysqltest  ${CLIENT_LIB} pcre2-posix pcre2-8)
 SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
 
 

client/mysqltest.cc

@@ -44,8 +44,8 @@
 #include <hash.h>
 #include <stdarg.h>
 #include <violite.h>
-#define PCRE_STATIC 1  /* Important on Windows */
-#include "pcreposix.h" /* pcreposix regex library */
+#define PCRE2_STATIC 1  /* Important on Windows */
+#include "pcre2posix.h" /* pcreposix regex library */
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif

cmake/pcre.cmake

@@ -5,24 +5,17 @@ SET(WITH_PCRE "auto" CACHE STRING
 
 MACRO (CHECK_PCRE)
   IF(WITH_PCRE STREQUAL "system" OR WITH_PCRE STREQUAL "auto")
-    CHECK_LIBRARY_EXISTS(pcre pcre_stack_guard "" HAVE_PCRE_STACK_GUARD)
-    IF(NOT CMAKE_CROSSCOMPILING)
-      SET(CMAKE_REQUIRED_LIBRARIES "pcre")
-      CHECK_C_SOURCE_RUNS("
-        #include <pcre.h>
-        int main() {
-        return -pcre_exec(NULL, NULL, NULL, -999, -999, 0, NULL, 0) < 256;
-        }"  PCRE_STACK_SIZE_OK)
-      SET(CMAKE_REQUIRED_LIBRARIES)
-    ENDIF()
+    CHECK_LIBRARY_EXISTS(pcre2-8 pcre2_match_8 "" HAVE_PCRE2)
   ENDIF()
-  IF(NOT HAVE_PCRE_STACK_GUARD OR NOT PCRE_STACK_SIZE_OK OR
-     WITH_PCRE STREQUAL "bundled")
+  IF(NOT HAVE_PCRE2 OR WITH_PCRE STREQUAL "bundled")
     IF (WITH_PCRE STREQUAL "system")
-      MESSAGE(FATAL_ERROR "system pcre is not found or unusable")
+      MESSAGE(FATAL_ERROR "system pcre2-8 library is not found or unusable")
     ENDIF()
-    SET(PCRE_INCLUDES ${CMAKE_BINARY_DIR}/pcre ${CMAKE_SOURCE_DIR}/pcre)
-    ADD_SUBDIRECTORY(pcre)
+    SET(PCRE_INCLUDES ${CMAKE_BINARY_DIR}/pcre2 ${CMAKE_SOURCE_DIR}/pcre2
+                     ${CMAKE_BINARY_DIR}/pcre2/src ${CMAKE_SOURCE_DIR}/pcre2/src)
+    SET(PCRE2_BUILD_TESTS OFF CACHE BOOL "Disable tests.")
+    SET(PCRE2_BUILD_PCRE2GREP OFF CACHE BOOL "Disable pcre2grep")
+    ADD_SUBDIRECTORY(pcre2)
   ENDIF()
 ENDMACRO()
 

config.h.cmake

@@ -549,6 +549,7 @@
 #define PACKAGE_VERSION "@VERSION@"
 #define VERSION "@VERSION@"
 #define PROTOCOL_VERSION 10
+#define PCRE2_CODE_UNIT_WIDTH 8
 
 #define MALLOC_LIBRARY "@MALLOC_LIBRARY@"
 

extra/mariabackup/CMakeLists.txt

@@ -37,7 +37,7 @@ INCLUDE_DIRECTORIES(
   )
 
 IF(NOT HAVE_SYSTEM_REGEX)
-  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/pcre)
+  INCLUDE_DIRECTORIES(${PCRE_INCLUDES})
 ENDIF()
 
 
@@ -91,7 +91,7 @@ ADD_SUBDIRECTORY(crc)
 
 TARGET_LINK_LIBRARIES(mariabackup sql sql_builtins crc)
 IF(NOT HAVE_SYSTEM_REGEX)
-  TARGET_LINK_LIBRARIES(mariabackup pcreposix)
+  TARGET_LINK_LIBRARIES(mariabackup pcre2-posix)
 ENDIF()
 
 

extra/mariabackup/xb_regex.h

@@ -25,7 +25,8 @@ my_regex is used on Windows and native calls are used on POSIX platforms. */
 #ifdef HAVE_SYSTEM_REGEX
 #include <regex.h>
 #else
-#include <pcreposix.h>
+#define PCRE2_STATIC 1             /* Important on Windows */
+#include <pcre2posix.h>
 #endif
 
 typedef regex_t* xb_regex_t;

libmysqld/CMakeLists.txt

@@ -154,7 +154,7 @@ ENDIF()
 
 
 SET(LIBS 
-  dbug strings mysys mysys_ssl pcre vio 
+  dbug strings mysys mysys_ssl pcre2-8 vio 
   ${ZLIB_LIBRARY} ${SSL_LIBRARIES} 
   ${LIBWRAP} ${LIBCRYPT} ${LIBDL}
   ${EMBEDDED_PLUGIN_LIBS}

libmysqld/examples/CMakeLists.txt

@@ -34,7 +34,7 @@ ENDIF(UNIX)
 
 MYSQL_ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.cc
   COMPONENT Test)
-TARGET_LINK_LIBRARIES(mysqltest_embedded mysqlserver pcreposix pcre)
+TARGET_LINK_LIBRARIES(mysqltest_embedded mysqlserver pcre2-8 pcre2-posix)
 
 IF(CMAKE_GENERATOR MATCHES "Xcode")
 # It does not seem possible to tell Xcode the resulting target might need

mysql-test/main/func_regexp_pcre.result

@@ -793,7 +793,7 @@ SELECT 'a\nb' RLIKE '(?-s)a.b';
 0
 SET default_regex_flags=DEFAULT;
 SELECT REGEXP_SUBSTR('Monday Mon','^((?<DN>Mon|Fri|Sun)day|(?<DN>Tue)sday).*(?P=DN)$');
-ERROR 42000: Got error 'two named subpatterns have the same name at offset 29' from regexp
+ERROR 42000: Got error 'two named subpatterns have the same name (PCRE2_DUPNAMES not set' from regexp
 SET default_regex_flags='DUPNAMES';
 SELECT REGEXP_SUBSTR('Monday Mon','^((?<DN>Mon|Fri|Sun)day|(?<DN>Tue)sday).*(?P=DN)$');
 REGEXP_SUBSTR('Monday Mon','^((?<DN>Mon|Fri|Sun)day|(?<DN>Tue)sday).*(?P=DN)$')
@@ -817,8 +817,7 @@ SELECT 'AB' RLIKE 'A# this is a comment\nB';
 1
 SET default_regex_flags=DEFAULT;
 SELECT 'Aq' RLIKE 'A\\q';
-'Aq' RLIKE 'A\\q'
-1
+ERROR 42000: Got error 'unrecognized character follows \ at offset 2' from regexp
 SET default_regex_flags='EXTRA';
 SELECT 'Aq' RLIKE 'A\\q';
 ERROR 42000: Got error 'unrecognized character follows \ at offset 2' from regexp
@@ -861,7 +860,7 @@ SELECT 0xE001 REGEXP @regCheck;
 0xE001 REGEXP @regCheck
 0
 Warnings:
-Warning	1139	Got error 'pcre_exec: Invalid utf8 byte sequence in the subject string' from regexp
+Warning	1139	Got error 'UTF-8 error: 1 byte missing at end' from regexp
 # Testing workaround N1: This makes the pattern to be a binary string:
 SET NAMES latin1;
 SET @regCheck= X'E001';
@@ -883,40 +882,31 @@ CAST(0xE001 AS BINARY) REGEXP @regCheck
 # MDEV-12420: Testing recursion overflow
 SELECT 1 FROM dual WHERE ('Alpha,Bravo,Charlie,Delta,Echo,Foxtrot,StrataCentral,Golf,Hotel,India,Juliet,Kilo,Lima,Mike,StrataL3,November,Oscar,StrataL2,Sand,P3,P4SwitchTest,Arsys,Poppa,ExtensionMgr,Arp,Quebec,Romeo,StrataApiV2,PtReyes,Sierra,SandAcl,Arrow,Artools,BridgeTest,Tango,SandT,PAlaska,Namespace,Agent,Qos,PatchPanel,ProjectReport,Ark,Gimp,Agent,SliceAgent,Arnet,Bgp,Ale,Tommy,Central,AsicPktTestLib,Hsc,SandL3,Abuild,Pca9555,Standby,ControllerDut,CalSys,SandLib,Sb820,PointV2,BfnLib,Evpn,BfnSdk,Sflow,ManagementActive,AutoTest,GatedTest,Bgp,Sand,xinetd,BfnAgentLib,bf-utils,Hello,BfnState,Eos,Artest,Qos,Scd,ThermoMgr,Uniform,EosUtils,Eb,FanController,Central,BfnL3,BfnL2,tcp_wrappers,Victor,Environment,Route,Failover,Whiskey,Xray,Gimp,BfnFixed,Strata,SoCal,XApi,Msrp,XpProfile,tcpdump,PatchPanel,ArosTest,FhTest,Arbus,XpAcl,MacConc,XpApi,telnet,QosTest,Alpha2,BfnVlan,Stp,VxlanControllerTest,MplsAgent,Bravo2,Lanz,BfnMbb,Intf,XCtrl,Unicast,SandTunnel,L3Unicast,Ipsec,MplsTest,Rsvp,EthIntf,StageMgr,Sol,MplsUtils,Nat,Ira,P4NamespaceDut,Counters,Charlie2,Aqlc,Mlag,Power,OpenFlow,Lag,RestApi,BfdTest,strongs,Sfa,CEosUtils,Adt746,MaintenanceMode,MlagDut,EosImage,IpEth,MultiProtocol,Launcher,Max3179,Snmp,Acl,IpEthTest,PhyEee,bf-syslibs,tacc,XpL2,p4-ar-switch,p4-bf-switch,LdpTest,BfnPhy,Mirroring,Phy6,Ptp'  REGEXP '^((?!\b(Strata|StrataApi|StrataApiV2)\b).)*$');
 1
-Warnings:
-Warning	1139	Got error 'pcre_exec: recursion limit of NUM exceeded' from regexp
+1
 SELECT CONCAT(REPEAT('100,',60),'101') RLIKE '^(([1-9][0-9]*),)*[1-9][0-9]*$';
 CONCAT(REPEAT('100,',60),'101') RLIKE '^(([1-9][0-9]*),)*[1-9][0-9]*$'
 1
 SELECT CONCAT(REPEAT('100,',200),'101') RLIKE '^(([1-9][0-9]*),)*[1-9][0-9]*$';
 CONCAT(REPEAT('100,',200),'101') RLIKE '^(([1-9][0-9]*),)*[1-9][0-9]*$'
-0
-Warnings:
-Warning	1139	Got error 'pcre_exec: recursion limit of NUM exceeded' from regexp
+1
 SELECT REGEXP_INSTR(CONCAT(REPEAT('100,',60),'101'), '^(([1-9][0-9]*),)*[1-9][0-9]*$');
 REGEXP_INSTR(CONCAT(REPEAT('100,',60),'101'), '^(([1-9][0-9]*),)*[1-9][0-9]*$')
 1
 SELECT REGEXP_INSTR(CONCAT(REPEAT('100,',200),'101'), '^(([1-9][0-9]*),)*[1-9][0-9]*$');
 REGEXP_INSTR(CONCAT(REPEAT('100,',200),'101'), '^(([1-9][0-9]*),)*[1-9][0-9]*$')
-0
-Warnings:
-Warning	1139	Got error 'pcre_exec: recursion limit of NUM exceeded' from regexp
+1
 SELECT LENGTH(REGEXP_SUBSTR(CONCAT(REPEAT('100,',60),'101'), '^(([1-9][0-9]*),)*[1-9][0-9]*$'));
 LENGTH(REGEXP_SUBSTR(CONCAT(REPEAT('100,',60),'101'), '^(([1-9][0-9]*),)*[1-9][0-9]*$'))
 243
 SELECT LENGTH(REGEXP_SUBSTR(CONCAT(REPEAT('100,',200),'101'), '^(([1-9][0-9]*),)*[1-9][0-9]*$'));
 LENGTH(REGEXP_SUBSTR(CONCAT(REPEAT('100,',200),'101'), '^(([1-9][0-9]*),)*[1-9][0-9]*$'))
-0
-Warnings:
-Warning	1139	Got error 'pcre_exec: recursion limit of NUM exceeded' from regexp
+803
 SELECT LENGTH(REGEXP_REPLACE(CONCAT(REPEAT('100,',60),'101'), '^(([1-9][0-9]*),)*[1-9][0-9]*$', ''));
 LENGTH(REGEXP_REPLACE(CONCAT(REPEAT('100,',60),'101'), '^(([1-9][0-9]*),)*[1-9][0-9]*$', ''))
 0
 SELECT LENGTH(REGEXP_REPLACE(CONCAT(REPEAT('100,',200),'101'), '^(([1-9][0-9]*),)*[1-9][0-9]*$', ''));
 LENGTH(REGEXP_REPLACE(CONCAT(REPEAT('100,',200),'101'), '^(([1-9][0-9]*),)*[1-9][0-9]*$', ''))
-803
-Warnings:
-Warning	1139	Got error 'pcre_exec: recursion limit of NUM exceeded' from regexp
+0
 SELECT REGEXP_INSTR('a_kollision', 'oll');
 REGEXP_INSTR('a_kollision', 'oll')
 4

mysql-test/main/func_regexp_pcre.test

@@ -382,6 +382,7 @@ SELECT 'AB' RLIKE 'A B';
 SELECT 'AB' RLIKE 'A# this is a comment\nB';
 SET default_regex_flags=DEFAULT;
 
+--error ER_REGEXP_ERROR
 SELECT 'Aq' RLIKE 'A\\q';
 SET default_regex_flags='EXTRA';
 --error ER_REGEXP_ERROR

mysql-test/main/mysqld--help.result

@@ -202,7 +202,8 @@ The following specify which files/extra groups are read (specified before remain
  using the password expiration options in ALTER USER.
  --default-regex-flags=name 
  Default flags for the regex library. Any combination of: 
- DOTALL, DUPNAMES, EXTENDED, EXTRA, MULTILINE, UNGREEDY
+ DOTALL, DUPNAMES, EXTENDED, EXTENDED_MORE, EXTRA, 
+ MULTILINE, UNGREEDY
  --default-storage-engine=name 
  The default storage engine for new tables
  --default-time-zone=name 

mysql-test/suite/sys_vars/r/default_regex_flags_basic.result

@@ -13,8 +13,8 @@ SELECT @@default_regex_flags;
 
 SET default_regex_flags='UNKNOWN';
 ERROR 42000: Variable 'default_regex_flags' can't be set to the value of 'UNKNOWN'
-SET default_regex_flags=123;
-ERROR 42000: Variable 'default_regex_flags' can't be set to the value of '123'
+SET default_regex_flags=325;
+ERROR 42000: Variable 'default_regex_flags' can't be set to the value of '325'
 SET default_regex_flags=123.0;
 ERROR 42000: Incorrect argument type to variable 'default_regex_flags'
 SET default_regex_flags=123e0;
@@ -31,7 +31,7 @@ DOTALL
 SET @@default_regex_flags=63;
 SELECT @@default_regex_flags;
 @@default_regex_flags
-DOTALL,DUPNAMES,EXTENDED,EXTRA,MULTILINE,UNGREEDY
+DOTALL,DUPNAMES,EXTENDED,EXTENDED_MORE,EXTRA,MULTILINE
 SET @@default_regex_flags='DOTALL';
 SELECT @@default_regex_flags;
 @@default_regex_flags

mysql-test/suite/sys_vars/r/sysvars_server_embedded.result

@@ -740,7 +740,7 @@ VARIABLE_COMMENT	Default flags for the regex library
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	DOTALL,DUPNAMES,EXTENDED,EXTRA,MULTILINE,UNGREEDY
+ENUM_VALUE_LIST	DOTALL,DUPNAMES,EXTENDED,EXTENDED_MORE,EXTRA,MULTILINE,UNGREEDY
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	DEFAULT_STORAGE_ENGINE

mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result

@@ -750,7 +750,7 @@ VARIABLE_COMMENT	Default flags for the regex library
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	DOTALL,DUPNAMES,EXTENDED,EXTRA,MULTILINE,UNGREEDY
+ENUM_VALUE_LIST	DOTALL,DUPNAMES,EXTENDED,EXTENDED_MORE,EXTRA,MULTILINE,UNGREEDY
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	DEFAULT_STORAGE_ENGINE

mysql-test/suite/sys_vars/t/default_regex_flags_basic.test

@@ -9,7 +9,7 @@ SELECT @@default_regex_flags;
 --error ER_WRONG_VALUE_FOR_VAR
 SET default_regex_flags='UNKNOWN';
 --error ER_WRONG_VALUE_FOR_VAR
-SET default_regex_flags=123;
+SET default_regex_flags=325;
 --error ER_WRONG_TYPE_FOR_VAR
 SET default_regex_flags=123.0;
 --error ER_WRONG_TYPE_FOR_VAR

sql/CMakeLists.txt

@@ -193,7 +193,7 @@ RECOMPILE_FOR_EMBEDDED)
 ADD_LIBRARY(sql STATIC ${SQL_SOURCE})
 DTRACE_INSTRUMENT(sql)
 TARGET_LINK_LIBRARIES(sql
-  mysys mysys_ssl dbug strings vio pcre
+  mysys mysys_ssl dbug strings vio pcre2-8
   ${LIBWRAP} ${LIBCRYPT} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT}
   ${SSL_LIBRARIES}
   ${LIBSYSTEMD})