Merge mariadb-10.11.17 into 10.11

Author: dr-m

dbug/dbug.c

@@ -222,6 +222,8 @@ static struct settings init_settings;
 static const char *db_process= 0;/* Pointer to process name; argv[0] */
 my_bool _dbug_on_= TRUE;	 /* FALSE if no debugging at all */
 static char * command_line= 0; /* copy of controls */
+#define FREE_COMMAND_LINE do{ free(command_line); command_line= 0; }while(0)
+
 
 typedef struct _db_code_state_ {
   const char *process;          /* Pointer to process name; usually argv[0] */
@@ -900,7 +902,7 @@ int _db_is_pushed_()
 void _db_set_init_(const char *control)
 {
   CODE_STATE tmp_cs;
-  /* see Writable() */
+  FREE_COMMAND_LINE;
   command_line= strdup(control);
   if (unlikely(!command_line))
   {
@@ -1697,11 +1699,7 @@ void _db_end_()
   init_done= 0;
   _dbug_on_= 0;
   /* see Writable() */
-  if (command_line)
-  {
-    free(command_line);
-    command_line= 0;
-  }
+  FREE_COMMAND_LINE;
 }
 
 

debian/autobake-deb.sh

@@ -19,6 +19,9 @@ export DEB_BUILD_OPTIONS="nocheck $DEB_BUILD_OPTIONS"
 # shellcheck source=/dev/null
 source ./VERSION
 
+architecture=$(dpkg-architecture -q DEB_BUILD_ARCH)
+uname_machine=$(uname -m)
+
 # General CI optimizations to keep build output smaller
 if [[ $GITLAB_CI ]]
 then
@@ -82,9 +85,6 @@ remove_package_notes()
   sed -e '/package.notes/d' -i debian/rules debian/control
 }
 
-architecture=$(dpkg-architecture -q DEB_BUILD_ARCH)
-uname_machine=$(uname -m)
-
 # Parse release name and number from Linux standard base release
 # Example:
 #   $ lsb_release -a

extra/mariabackup/xbstream.cc

@@ -320,6 +320,11 @@ file_entry_new(extract_ctxt_t *ctxt, const char *path, uint pathlen,
 	file_entry_t	*entry;
 	ds_file_t	*file;
 
+        if (*path == '.' || *path == '/' || strstr(path, "/../")) {
+		msg("%s: invalid filename %s", my_progname, path);
+                return NULL;
+        }
+
 	entry = (file_entry_t *) my_malloc(PSI_NOT_INSTRUMENTED, sizeof(file_entry_t),
 					   MYF(MY_WME | MY_ZEROFILL));
 	if (entry == NULL) {

extra/wolfssl/wolfssl

@@ -34,7 +34,7 @@ extern "C" {
 #define MY_XML_FLAG_RELATIVE_NAMES 1
 
 /*
-  A flag whether to skip normilization of text values before calling
+  A flag whether to skip normalization of text values before calling
   call-back functions: i.e. skip leading/trailing spaces,
   \r, \n, \t characters.
 */

include/my_xml.h

@@ -27,8 +27,8 @@ openssl rsa -in server-key.pem -out server-key.pem
 # sign the server certificate with CA certificate
 openssl ca -keyfile cakey.pem -days 7300 -batch -cert cacert.pem -policy policy_anything -out server-cert.pem -in demoCA/server-req.pem
 
-# server certificate with different validity period (MDEV-7598)
-openssl req -newkey rsa:4096 -keyout server-new-key.pem -out demoCA/server-new-req.pem -days 7301 -nodes -subj '/CN=server-new/C=FI/ST=Helsinki/L=Helsinki/O=MariaDB'
+# server certificate with different validity period (MDEV-7598) and unsafe for shell interpolation (MDEV-39413)
+openssl req -newkey rsa:4096 -keyout server-new-key.pem -out demoCA/server-new-req.pem -days 7301 -nodes -subj /CN="'\`touch A\`'"'-"`touch B`"/C=FI/ST=Helsinki/L=Helsinki/O=MariaDB'
 openssl rsa -in server-new-key.pem -out server-new-key.pem
 openssl ca -keyfile cakey.pem -days 7301 -batch -cert cacert.pem -policy policy_anything -out server-new-cert.pem -in demoCA/server-new-req.pem
 

libmariadb

@@ -3131,6 +3131,29 @@ alter table t1 drop constraint t1_fk_t2_id, drop t2_id, drop t2_id;
 ERROR 42000: Can't DROP COLUMN `t2_id`; check that it exists
 drop table t1, t2;
 #
+# MDEV-34951: InnoDB index corruption when renaming key name with same letter to upper case.
+#
+CREATE TABLE t (a INT, b INT, KEY(a), KEY(b)) ENGINE=INNODB;
+ALTER TABLE t RENAME KEY b TO B;
+SELECT * FROM t;
+a	b
+DROP TABLE t;
+CREATE TABLE t (c INT UNIQUE) ENGINE=InnoDB;
+ALTER TABLE t RENAME KEY c TO C;
+SELECT * FROM t;
+c
+DROP TABLE t;
+CREATE TABLE t (c POINT GENERATED ALWAYS AS (POINT(1,1)) UNIQUE) ENGINE=InnoDB;
+ALTER TABLE t RENAME KEY c to C;
+INSERT INTO t VALUES (1);
+ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
+DROP TABLE t;
+CREATE TABLE t (c POINT GENERATED ALWAYS AS (POINT(1,1)) UNIQUE) ENGINE=InnoDB;
+ALTER TABLE t RENAME KEY c to C;
+INSERT INTO t VALUES (1,1);
+ERROR 21S01: Column count doesn't match value count at row 1
+DROP TABLE t;
+#
 # MDEV-29001 DROP DEFAULT makes SHOW CREATE non-idempotent
 #
 SET @save_sql_mode=@@sql_mode;

mysql-test/lib/generate-ssl-certs.sh

@@ -2417,6 +2417,32 @@ create table t1(id int primary key, t2_id int, constraint t1_fk_t2_id foreign ke
 alter table t1 drop constraint t1_fk_t2_id, drop t2_id, drop t2_id;
 drop table t1, t2;
 
+--echo #
+--echo # MDEV-34951: InnoDB index corruption when renaming key name with same letter to upper case.
+--echo #
+
+CREATE TABLE t (a INT, b INT, KEY(a), KEY(b)) ENGINE=INNODB;
+ALTER TABLE t RENAME KEY b TO B;
+SELECT * FROM t;
+DROP TABLE t;
+
+CREATE TABLE t (c INT UNIQUE) ENGINE=InnoDB;
+ALTER TABLE t RENAME KEY c TO C;
+SELECT * FROM t;
+DROP TABLE t;
+
+CREATE TABLE t (c POINT GENERATED ALWAYS AS (POINT(1,1)) UNIQUE) ENGINE=InnoDB;
+ALTER TABLE t RENAME KEY c to C;
+--error ER_CANT_CREATE_GEOMETRY_OBJECT
+INSERT INTO t VALUES (1);
+DROP TABLE t;
+
+CREATE TABLE t (c POINT GENERATED ALWAYS AS (POINT(1,1)) UNIQUE) ENGINE=InnoDB;
+ALTER TABLE t RENAME KEY c to C;
+--error ER_WRONG_VALUE_COUNT_ON_ROW
+INSERT INTO t VALUES (1,1);
+DROP TABLE t;
+
 --echo #
 --echo # MDEV-29001 DROP DEFAULT makes SHOW CREATE non-idempotent
 --echo #

mysql-test/main/alter_table.result

@@ -1,3 +1,6 @@
+#
+# MDEV-4462 mysqld gets SIGFPE when mysql.user table is empty
+#
 create table t1 as select * from mysql.global_priv;
 truncate table mysql.global_priv;
 flush privileges;
@@ -14,3 +17,14 @@ connect(localhost,u1,,test,MASTER_PORT,MASTER_SOCKET);
 connect  fail,localhost,u1;
 Got one of the listed errors
 # switching back from mysql.user to mysql.global_priv
+#
+# MDEV-39266 Stack Overflow via alloca() in Privilege Table JSON Parser
+#
+INSERT INTO mysql.global_priv (Host, User, Priv) VALUES
+('localhost', 'MDEV-39266', CONCAT(
+'{"access":0,"plugin":"mysql_native_password","authentication_string":"',
+REPEAT('X', 400000),
+'","password_last_changed":0}'));
+FLUSH PRIVILEGES;
+DROP USER `MDEV-39266`@localhost;
+# End if 10.6 tests