Merge 11.8 into main

Author: dr-m

client/mysqlimport.cc

@@ -984,6 +984,8 @@ static void fatal_error(const char *format, ...)
 
 static void db_error(MYSQL *mysql)
 {
+ if (aborting)
+ return;
  const char *info= mysql_info(mysql);
  auto err= mysql_errno(mysql);
  auto err_text = mysql_error(mysql);

cmake/generate_sbom.cmake

@@ -48,9 +48,12 @@ FUNCTION(SBOM_GET_CPE name version var)
  "boost" "boost:boost"
  "thrift" "apache:thrift"
  )
- LIST(FIND cpe_prefix_map "${name}" i)
- IF(i GREATER -1)
- MATH(EXPR next_idx "${i}+1")
+ LIST(FIND cpe_prefix_map "${name}" idx_cpe_mapping)
+ # Version needs to have at least one dot character in it.
+ # Otherwise, we assume it is a git hash, and do not generate CPE
+ STRING(FIND "${version}" "." idx_version_dot)
+ IF((idx_cpe_mapping GREATER -1) AND (idx_version_dot GREATER -1))
+ MATH(EXPR next_idx "${idx_cpe_mapping}+1")
  LIST(GET cpe_prefix_map ${next_idx} cpe_name_and_vendor)
  STRING(REGEX REPLACE "[^0-9\\.]" "" cleaned_version "${version}")
  SET(${var} "cpe:2.3:a:${cpe_name_and_vendor}:${cleaned_version}:*:*:*:*:*:*:*" PARENT_SCOPE)
@@ -101,10 +104,9 @@ FUNCTION (sbom_get_supplier repo_name repo_user varname)
  SET(${varname} "MariaDB" PARENT_SCOPE)
  ELSEIF (repo_name MATCHES "boost")
  SET(${varname} "Boost.org" PARENT_SCOPE)
+ ELSEIF(repo_user MATCHES "mariadb-corporation|mariadb")
+ SET(${varname} "MariaDB")
  ELSE()
- IF(repo_user MATCHES "mariadb-corporation|mariadb")
- set(repo_user "MariaDB")
- ENDIF()
  # Capitalize just first letter in repo_user
  STRING(SUBSTRING "${repo_user}" 0 1 first_letter)
  STRING(SUBSTRING "${repo_user}" 1 -1 rest)

libmysqld/CMakeLists.txt

@@ -71,6 +71,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
  ../sql/log_event.cc ../sql/log_event_server.cc 
  ../sql/mf_iocache.cc ../sql/my_decimal.cc 
  ../sql/net_serv.cc ../sql/opt_range.cc
+ ../sql/opt_group_by_cardinality.cc
  ../sql/opt_rewrite_date_cmp.cc
  ../sql/opt_rewrite_remove_casefold.cc
  ../sql/opt_sargable_left.cc

mysql-test/include/sp-cursor-pkg-01.inc

@@ -0,0 +1,24 @@
+DELIMITER $$;
+CREATE PACKAGE pkg
+ FUNCTION f1() RETURNS INT;
+END;
+$$
+CREATE PACKAGE BODY pkg
+ DECLARE vc INT DEFAULT 0;
+ FUNCTION f1() RETURNS INT
+ BEGIN
+ DECLARE cur CURSOR FOR SELECT 1 AS c FROM DUAL;
+ OPEN cur;
+ FETCH cur INTO vc; -- SHOW CODE should display vc with a "PACKAGE_BODY" prefix
+ CLOSE cur;
+ RETURN vc;
+ END;
+ BEGIN
+ DECLARE cur CURSOR FOR SELECT 1 AS c FROM DUAL;
+ OPEN cur;
+ FETCH cur INTO vc; -- SHOW CODE should display vc without a prefix
+ CLOSE cur;
+ END;
+END;
+$$
+DELIMITER ;$$

mysql-test/include/sp-cursor-pkg-02.inc

@@ -0,0 +1,20 @@
+# Mixing a package body variable and a local variable in the same FETCH.
+DELIMITER $$;
+CREATE PACKAGE pkg
+ FUNCTION f1() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pkg
+ DECLARE vc1 INT DEFAULT 0;
+ FUNCTION f1() RETURNS TEXT
+ BEGIN
+ DECLARE vc2 INT DEFAULT 0;
+ DECLARE cur CURSOR FOR SELECT 1 AS c1, 2 AS c2 FROM DUAL;
+ OPEN cur;
+ FETCH cur INTO vc1, vc2;
+ CLOSE cur;
+ RETURN CONCAT(vc1, ' ', vc2);
+ END;
+END;
+$$
+DELIMITER ;$$

mysql-test/include/sp-cursor-pkg-03.inc

@@ -0,0 +1,19 @@
+# Fetching into a PACKAGE BODY variable of the ROW type
+DELIMITER $$;
+CREATE PACKAGE pkg
+ FUNCTION f1() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pkg
+ DECLARE vc ROW(p1 INT, p2 INT);
+ FUNCTION f1() RETURNS TEXT
+ BEGIN
+ DECLARE cur CURSOR FOR SELECT 1 AS c1, 2 AS c2 FROM DUAL;
+ OPEN cur;
+ FETCH cur INTO vc;
+ CLOSE cur;
+ RETURN CONCAT(vc.p1, ' ', vc.p2);
+ END;
+END;
+$$
+DELIMITER ;$$

mysql-test/main/comment_database.result

@@ -76,3 +76,16 @@ WHERE schema_name='comment';
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
 def	comment	latin2	latin2_general_ci	NULL	comment
 DROP DATABASE comment;
+CREATE DATABASE db1;
+# restart
+SHOW CREATE DATABASE db1;
+Database	Create Database
+db1	CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci */
+Warnings:
+Note	1105	Database 'db1' does not have a db.opt file. You can create one with ALTER DATABASE if needed
+SHOW CREATE DATABASE db1;
+Database	Create Database
+db1	CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci */
+Warnings:
+Note	1105	Database 'db1' does not have a db.opt file. You can create one with ALTER DATABASE if needed
+DROP DATABASE db1;

mysql-test/main/comment_database.test

@@ -63,3 +63,11 @@ SELECT * FROM information_schema.schemata
 WHERE schema_name='comment';
 DROP DATABASE comment;
 --enable_service_connection
+
+CREATE DATABASE db1;
+--remove_file $MARIADB_DATADIR/db1/db.opt
+--source include/restart_mysqld.inc
+# We need to call this two times to ensure all code paths are used
+SHOW CREATE DATABASE db1;
+SHOW CREATE DATABASE db1;
+DROP DATABASE db1;

mysql-test/main/ctype_utf8_def_upgrade.result

@@ -68,6 +68,8 @@ SET @@collation_database=DEFAULT;
 SHOW CREATE DATABASE db1;
 Database	Create Database
 db1	CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */
+Warnings:
+Note	1105	Database 'db1' does not have a db.opt file. You can create one with ALTER DATABASE if needed
 USE db1;
 SELECT @@collation_database, 'taken from defaults' AS comment;
 @@collation_database	comment

mysql-test/main/derived.result

@@ -318,7 +318,7 @@ a	7.0000
 b	3.5000
 explain SELECT s.name, AVG(s.val) AS median FROM (SELECT x.name, x.val FROM t1 x, t1 y WHERE x.name=y.name GROUP BY x.name, x.val HAVING SUM(y.val <= x.val) >= COUNT(*)/2 AND SUM(y.val >= x.val) >= COUNT(*)/2) AS s GROUP BY s.name;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL289Using temporary; Using filesort
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL17Using temporary; Using filesort
 2	DERIVED	x	ALL	NULL	NULL	NULL	NULL	17	Using temporary; Using filesort
 2	DERIVED	y	ALL	NULL	NULL	NULL	NULL	17	Using where; Using join buffer (flat, BNL join)
 drop table t1;
@@ -1999,8 +1999,8 @@ group by ic1
 ) dt1 (oc1, oc2, oc3)
 join t3 on t3.c1 = dt1.oc1+9;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARYt3ALL	NULL	NULL	NULL	NULL	2
-1	PRIMARY<derived2>ALL	NULL	NULL	NULL	NULL4Using where; Using join buffer (flat, BNL join)
+1	PRIMARY<derived2>ALL	NULL	NULL	NULL	NULL	2
+1	PRIMARYt3ALL	NULL	NULL	NULL	NULL2Using where; Using join buffer (flat, BNL join)
 2	DERIVED	<derived3>	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort
 2	DERIVED	t2	ALL	NULL	NULL	NULL	NULL	2	Using where; Using join buffer (flat, BNL join)
 3	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort