diff options
author | Alexander Barkov <bar@mariadb.com> | 2022-09-14 15:00:09 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.com> | 2022-09-14 16:24:51 +0400 |
commit | fe844c16b6cbd67386d1b9fc1cb9e5a656bbb885 (patch) | |
tree | 0bd937aed2faa10b09c0b47884dad4a8e1d5d57c /mysql-test/main/func_regexp_pcre.result | |
parent | fb70bb44d096f4117e9454740aa4fa0651a1a69e (diff) | |
parent | 289105e282fb5f7865bb7ddb6226149ac5bdf2b8 (diff) | |
download | mariadb-git-fe844c16b6cbd67386d1b9fc1cb9e5a656bbb885.tar.gz |
Merge remote-tracking branch 'origin/10.4' into 10.5
Diffstat (limited to 'mysql-test/main/func_regexp_pcre.result')
-rw-r--r-- | mysql-test/main/func_regexp_pcre.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/main/func_regexp_pcre.result b/mysql-test/main/func_regexp_pcre.result index 3b0688fc70e..c0d91dd9398 100644 --- a/mysql-test/main/func_regexp_pcre.result +++ b/mysql-test/main/func_regexp_pcre.result @@ -436,8 +436,8 @@ CREATE TABLE t1 AS SELECT REGEXP_REPLACE('abc','b','x'); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `REGEXP_REPLACE('abc','b','x')` longtext CHARACTER SET utf8 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 + `REGEXP_REPLACE('abc','b','x')` longtext CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; EXPLAIN EXTENDED SELECT REGEXP_REPLACE('abc','b','x'); id select_type table type possible_keys key key_len ref rows filtered Extra @@ -452,7 +452,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `REGEXP_REPLACE('abc','b','x')+0` double NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SELECT REGEXP_REPLACE(NULL,'b','c'); REGEXP_REPLACE(NULL,'b','c') @@ -739,8 +739,8 @@ CREATE TABLE t1 AS SELECT REGEXP_SUBSTR('abc','b'); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `REGEXP_SUBSTR('abc','b')` varchar(3) CHARACTER SET utf8 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 + `REGEXP_SUBSTR('abc','b')` varchar(3) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; EXPLAIN EXTENDED SELECT REGEXP_SUBSTR('abc','b'); id select_type table type possible_keys key key_len ref rows filtered Extra @@ -755,7 +755,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `REGEXP_SUBSTR('abc','b')+0` double NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SELECT REGEXP_SUBSTR('See https://mariadb.org/en/foundation/ for details', 'https?://[^/]*'); REGEXP_SUBSTR('See https://mariadb.org/en/foundation/ for details', 'https?://[^/]*') |