Merge branch 'bb-10.11-release' into bb-11.4-release

Author: sanja-byelkin

libmariadb

@@ -5583,4 +5583,16 @@ set sql_mode= @orig_sql_mode;
 select st_astext(st_geomfromwkb(x'0103000000020000000400000000000000000000000000000000000000000000000000f03f0000000000000000000000000000f03f000000000000f03f0000000000000000000000000000000005000000000000000000e03f000000000000e03f')) 'no asan error here';
 no asan error here
 NULL
+SELECT ST_GeomFromWKB(x'0103000000020000000400000000000000000000000000000000000000000000000000F03F0000000000000000000000000000F03F000000000000F03F0000000000000000000000000000000001000000') IS NOT NULL AS pg;
+pg
+0
+SELECT ST_GeomFromWKB(x'01050000000200000001020000000200000000000000000000000000000000000000000000000000F03F000000000000F03F01020000000100000000000000000000') IS NOT NULL AS ml;
+ml
+0
+SELECT ST_GeomFromWKB(x'01060000000100000001030000000100000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000') IS NOT NULL AS mp;
+mp
+0
+SELECT ST_GeomFromWKB(x'01070000000100000001070000000100000001070000000100000001020000000100000000000000') IS NOT NULL AS gc;
+gc
+0
 # End of 10.6 tests

mysql-test/main/gis.result

@@ -3563,4 +3563,9 @@ set sql_mode= @orig_sql_mode;
 --echo #
 select st_astext(st_geomfromwkb(x'0103000000020000000400000000000000000000000000000000000000000000000000f03f0000000000000000000000000000f03f000000000000f03f0000000000000000000000000000000005000000000000000000e03f000000000000e03f')) 'no asan error here';
 
+SELECT ST_GeomFromWKB(x'0103000000020000000400000000000000000000000000000000000000000000000000F03F0000000000000000000000000000F03F000000000000F03F0000000000000000000000000000000001000000') IS NOT NULL AS pg;
+SELECT ST_GeomFromWKB(x'01050000000200000001020000000200000000000000000000000000000000000000000000000000F03F000000000000F03F01020000000100000000000000000000') IS NOT NULL AS ml;
+SELECT ST_GeomFromWKB(x'01060000000100000001030000000100000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000') IS NOT NULL AS mp;
+SELECT ST_GeomFromWKB(x'01070000000100000001070000000100000001070000000100000001020000000100000000000000') IS NOT NULL AS gc;
+
 --echo # End of 10.6 tests

mysql-test/main/gis.test

@@ -45,7 +45,7 @@ call mtr.add_suppression('Removing .*/xtrabackup_galera_info file due to signal'
 --exec echo ssl-key=$MYSQL_TEST_DIR/std_data/server-new-key.pem >> $MYSQLTEST_VARDIR/my.cnf
 
 --echo # start the server
---error 0
+--error 0,134
 --exec $MYSQLD_LAST_CMD
 --echo # the server failed to start
 
@@ -55,6 +55,7 @@ call mtr.add_suppression('Removing .*/xtrabackup_galera_info file due to signal'
 --echo # cleanup
 # we have to kill joiner's socat here, because the donor has aborted SST
 # and joiner's socat will timeout in 5 minutes
+--error 0,15
 --exec pkill -f 'socat.*server-new-cert'
 --exec echo ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert.pem >> $MYSQLTEST_VARDIR/my.cnf
 --exec echo ssl-key=$MYSQL_TEST_DIR/std_data/server-key.pem >> $MYSQLTEST_VARDIR/my.cnf

mysql-test/suite/galera/t/galera_sst_mariabackup_encrypt_with_key_server.test

@@ -3964,73 +3964,18 @@ a
 5
 DROP TABLE t1;
 #
-# End of 10.11 tests
-#
-#
-# MDEV-30088 Assertion `cond_selectivity <= 1.0' failed in get_range_limit_read_cost
-#
-CREATE TABLE t1 (a TIMESTAMP, KEY(a)) ENGINE=MRG_MyISAM;
-explain SELECT a, COUNT(*) FROM t1 WHERE a >= '2000-01-01 00:00:00' GROUP BY a;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
-SELECT a, COUNT(*) FROM t1 WHERE a >= '2000-01-01 00:00:00' GROUP BY a;
-a	COUNT(*)
-DROP TABLE t1;
+# MDEV-39494 UBSAN failure
 #
-# MDEV-30525: Assertion `ranges > 0' fails in IO_AND_CPU_COST handler::keyread_time
+# This test was ported down from 11.x and was originally implemented under MDEV-30525.
+# Under 10.11, this scenario results in a divide-by-zero failure because there are zero
+# table records available.
 #
 CREATE TABLE t1 (a INT, KEY(a)) ENGINE=MyISAM;
 CREATE TABLE t2 (a INT, KEY(a)) ENGINE=MyISAM;
 CREATE TABLE tm (a INT, KEY(a)) ENGINE=MRG_MyISAM UNION=(t1,t2);
 SELECT DISTINCT a FROM tm WHERE a > 50;
 a
 DROP TABLE tm, t1, t2;
-# Testcase 2:
-CREATE TABLE t1 (a INT, KEY(a)) ENGINE=MyISAM;
-CREATE TABLE t2 (a INT, KEY(a)) ENGINE=MyISAM;
-CREATE TABLE tm (a INT, KEY(a)) ENGINE=MERGE UNION = (t1, t2) INSERT_METHOD=FIRST;
-ANALYZE TABLE tm PERSISTENT FOR ALL;
-Table	Op	Msg_type	Msg_text
-test.tm	analyze	status	Engine-independent statistics collected
-test.tm	analyze	note	The storage engine for the table doesn't support analyze
-SELECT DISTINCT a FROM (SELECT * FROM tm WHERE a iS NOT NULL) AS sq;
-a
-DROP TABLE tm, t1, t2;
-#
-# MDEV-30568 Assertion `cond_selectivity <= 1.000000001' failed in get_range_limit_read_cost
-#
-CREATE TABLE t1 (f INT, KEY(f)) ENGINE=MyISAM;
-CREATE TABLE t2 (f INT, KEY(f)) ENGINE=MyISAM;
-CREATE TABLE tm (f INT, KEY(f)) ENGINE=MERGE UNION = (t1, t2);
-SELECT DISTINCT f FROM tm WHERE f IN (47, 126, 97, 48, 73, 0);
-f
-DROP TABLE tm, t1, t2;
-#
-# MDEV-30786 SIGFPE in cost_group_min_max on EXP
-#
-SET use_stat_tables='preferably';
-CREATE TABLE t1 (a INT,b INT,KEY i1 (a),KEY i2 (b)) ENGINE=MRG_MyISAM;
-ANALYZE LOCAL TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	analyze	status	Engine-independent statistics collected
-test.t1	analyze	note	The storage engine for the table doesn't support analyze
-EXPLAIN SELECT DISTINCT a FROM t1;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	NULL	i1	5	NULL	1	Using index for group-by
-drop table t1;
-set use_stat_tables=default;
-#
-# End of 11.0 tests
-#
-#
-# MDEV-29174: UPDATE of view that uses MERGE table
-#
-CREATE TABLE t1 (a int) ENGINE=MERGE;
-CREATE VIEW v1 AS SELECT a FROM t1;
-UPDATE v1 SET a=0;
-DROP VIEW v1;
-DROP TABLE t1;
-# End of 11.1 tests
 #
 # MDEV-38474 Double free or corruption, ASAN heap-use-after-free in st_join_table::cleanup
 #
@@ -4057,5 +4002,5 @@ UPDATE t1 STRAIGHT_JOIN t2 SET a = 89 WHERE 9 IN (SELECT c FROM t3 WHERE c IN (S
 ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
 DROP TABLE t1, t2, t3, t4;
 #
-# End of 11.4 tests
+# End of 10.11 tests
 #

mysql-test/suite/merge/merge.result

@@ -2903,69 +2903,19 @@ EXECUTE nested;
 DROP TABLE t1;
 
 --echo #
---echo # End of 10.11 tests
---echo #
-
---echo #
---echo # MDEV-30088 Assertion `cond_selectivity <= 1.0' failed in get_range_limit_read_cost
---echo #
-
-CREATE TABLE t1 (a TIMESTAMP, KEY(a)) ENGINE=MRG_MyISAM;
-explain SELECT a, COUNT(*) FROM t1 WHERE a >= '2000-01-01 00:00:00' GROUP BY a;
-SELECT a, COUNT(*) FROM t1 WHERE a >= '2000-01-01 00:00:00' GROUP BY a;
-DROP TABLE t1;
-
+--echo # MDEV-39494 UBSAN failure
 --echo #
---echo # MDEV-30525: Assertion `ranges > 0' fails in IO_AND_CPU_COST handler::keyread_time
+--echo # This test was ported down from 11.x and was originally implemented under MDEV-30525.
+--echo # Under 10.11, this scenario results in a divide-by-zero failure because there are zero
+--echo # table records available.
 --echo #
 CREATE TABLE t1 (a INT, KEY(a)) ENGINE=MyISAM;
 CREATE TABLE t2 (a INT, KEY(a)) ENGINE=MyISAM;
 CREATE TABLE tm (a INT, KEY(a)) ENGINE=MRG_MyISAM UNION=(t1,t2);
+# Must have zero records to produce UBSAN failure on divide-by-zero.
 SELECT DISTINCT a FROM tm WHERE a > 50;
 DROP TABLE tm, t1, t2;
 
---echo # Testcase 2:
-CREATE TABLE t1 (a INT, KEY(a)) ENGINE=MyISAM;
-CREATE TABLE t2 (a INT, KEY(a)) ENGINE=MyISAM;
-CREATE TABLE tm (a INT, KEY(a)) ENGINE=MERGE UNION = (t1, t2) INSERT_METHOD=FIRST;
-ANALYZE TABLE tm PERSISTENT FOR ALL;
-SELECT DISTINCT a FROM (SELECT * FROM tm WHERE a iS NOT NULL) AS sq;
-DROP TABLE tm, t1, t2;
-
---echo #
---echo # MDEV-30568 Assertion `cond_selectivity <= 1.000000001' failed in get_range_limit_read_cost
---echo #
-CREATE TABLE t1 (f INT, KEY(f)) ENGINE=MyISAM;
-CREATE TABLE t2 (f INT, KEY(f)) ENGINE=MyISAM;
-CREATE TABLE tm (f INT, KEY(f)) ENGINE=MERGE UNION = (t1, t2);
-SELECT DISTINCT f FROM tm WHERE f IN (47, 126, 97, 48, 73, 0);
-DROP TABLE tm, t1, t2;
-
---echo #
---echo # MDEV-30786 SIGFPE in cost_group_min_max on EXP
---echo #
-SET use_stat_tables='preferably';
-CREATE TABLE t1 (a INT,b INT,KEY i1 (a),KEY i2 (b)) ENGINE=MRG_MyISAM;
-ANALYZE LOCAL TABLE t1;
-EXPLAIN SELECT DISTINCT a FROM t1;
-drop table t1;
-set use_stat_tables=default;
-
---echo #
---echo # End of 11.0 tests
---echo #
---echo #
---echo # MDEV-29174: UPDATE of view that uses MERGE table
---echo #
-
-CREATE TABLE t1 (a int) ENGINE=MERGE;
-CREATE VIEW v1 AS SELECT a FROM t1;
-UPDATE v1 SET a=0;
-DROP VIEW v1;
-DROP TABLE t1;
-
---echo # End of 11.1 tests
-
 --echo #
 --echo # MDEV-38474 Double free or corruption, ASAN heap-use-after-free in st_join_table::cleanup
 --echo #
@@ -2997,5 +2947,5 @@ UPDATE t1 STRAIGHT_JOIN t2 SET a = 89 WHERE 9 IN (SELECT c FROM t3 WHERE c IN (S
 DROP TABLE t1, t2, t3, t4;
 
 --echo #
---echo # End of 11.4 tests
+--echo # End of 10.11 tests
 --echo #

mysql-test/suite/merge/merge.test

@@ -24,9 +24,9 @@ select count(*) from t1;
 count(*)
 100
 set @@global.s3_debug=0;
-FOUND 6 /s3_test_/ in mysqld.1.err
+FOUND 8 /s3_test_/ in mysqld.1.err
 select count(*) from t1;
 count(*)
 100
 drop table t1;
-FOUND 6 /s3_test_/ in mysqld.1.err
+FOUND 8 /s3_test_/ in mysqld.1.err

mysql-test/suite/s3/debug.result

@@ -15529,6 +15529,9 @@ void cost_group_min_max(TABLE* table, KEY *index_info, uint used_key_parts,
   else
     num_groups= records;
 
+  DBUG_ASSERT(keys_per_group > 0);
+  DBUG_ASSERT(num_groups > 0);
+
   /* Apply the selectivity of the quick select for group prefixes. */
   if (range_tree && (quick_prefix_records != HA_POS_ERROR))
   {

sql/opt_range.cc

@@ -25,6 +25,8 @@
 double my_double_round(double value, longlong dec, bool dec_unsigned,
                        bool truncate);
 
+#define advance(wkb,len,N)      do { wkb+=(N); len-=(N); } while(0)
+
 #ifdef HAVE_SPATIAL
 
 /* 
@@ -472,16 +474,17 @@ Geometry *Geometry::create_from_wkb(Geometry_buffer *buffer,
 
   if (len < WKB_HEADER_SIZE)
     return NULL;
-  geom_type= wkb_get_uint(wkb+1, (wkbByteOrder)wkb[0]);
+  wkbByteOrder bo= (wkbByteOrder)wkb[0];
+  geom_type= wkb_get_uint(wkb+1, bo);
   if (!(geom= create_by_typeid(buffer, (int) geom_type)) ||
       res->reserve(WKB_HEADER_SIZE, 512))
     return NULL;
 
   res->q_append((char) wkb_ndr);
   res->q_append(geom_type);
 
-  return geom->init_from_wkb(wkb + WKB_HEADER_SIZE, len - WKB_HEADER_SIZE,
-                             (wkbByteOrder) wkb[0], res) ? geom : NULL;
+  advance(wkb,len,WKB_HEADER_SIZE);
+  return geom->init_from_wkb(wkb, len, bo, res) ? geom : 0;
 }
 
 
@@ -1634,8 +1637,7 @@ uint Gis_polygon::init_from_wkb(const char *wkb, uint len, wkbByteOrder bo,
 
   if (res->reserve(4, 512))
     return 0;
-  wkb+= 4;
-  len-= 4;
+  advance(wkb,len,4);
   res->q_append(n_linear_rings);
 
   while (n_linear_rings--)
@@ -1652,8 +1654,7 @@ uint Gis_polygon::init_from_wkb(const char *wkb, uint len, wkbByteOrder bo,
 
     if (ls.is_closed(&closed) || !closed)
       return 0;
-    wkb+= ls_len;
-    len-= ls_len;
+    advance(wkb,len,ls_len);
   }
 
   return (uint) (wkb - wkb_orig);
@@ -2518,7 +2519,7 @@ uint Gis_multi_line_string::init_from_wkb(const char *wkb, uint len,
     return 0;
   res->q_append(n_line_strings);
 
-  wkb+= 4;
+  advance(wkb,len,4);
   while (n_line_strings--)
   {
     Gis_line_string ls;
@@ -2530,13 +2531,12 @@ uint Gis_multi_line_string::init_from_wkb(const char *wkb, uint len,
 
     res->q_append((char) wkb_ndr);
     res->q_append((uint32) wkb_linestring);
+    wkbByteOrder bo= (wkbByteOrder)wkb[0];
+    advance(wkb,len,WKB_HEADER_SIZE);
 
-    if (!(ls_len= ls.init_from_wkb(wkb + WKB_HEADER_SIZE, len,
-                                   (wkbByteOrder) wkb[0], res)))
+    if (!(ls_len= ls.init_from_wkb(wkb, len, bo, res)))
       return 0;
-    ls_len+= WKB_HEADER_SIZE;;
-    wkb+= ls_len;
-    len-= ls_len;
+    advance(wkb,len,ls_len);
   }
   return (uint) (wkb - wkb_orig);
 }
@@ -2893,7 +2893,7 @@ uint Gis_multi_polygon::init_from_wkb(const char *wkb, uint len,
     return 0;
   res->q_append(n_poly);
 
-  wkb+=4;
+  advance(wkb,len,4);
   while (n_poly--)
   {
     Gis_polygon p;
@@ -2905,12 +2905,11 @@ uint Gis_multi_polygon::init_from_wkb(const char *wkb, uint len,
     res->q_append((char) wkb_ndr);
     res->q_append((uint32) wkb_polygon);
 
-    if (!(p_len= p.init_from_wkb(wkb + WKB_HEADER_SIZE, len,
-                                 (wkbByteOrder) wkb[0], res)))
+    wkbByteOrder bo= (wkbByteOrder)wkb[0];
+    advance(wkb,len,WKB_HEADER_SIZE);
+    if (!(p_len= p.init_from_wkb(wkb, len, bo, res)))
       return 0;
-    p_len+= WKB_HEADER_SIZE;
-    wkb+= p_len;
-    len-= p_len;
+    advance(wkb,len,p_len);
   }
   return (uint) (wkb - wkb_orig);
 }
@@ -3409,7 +3408,7 @@ uint Gis_geometry_collection::init_from_wkb(const char *wkb, uint len,
     return 0;
   res->q_append(n_geom);
 
-  wkb+= 4;
+  advance(wkb,len,4);
   while (n_geom--)
   {
     Geometry_buffer buffer;
@@ -3421,17 +3420,16 @@ uint Gis_geometry_collection::init_from_wkb(const char *wkb, uint len,
         res->reserve(WKB_HEADER_SIZE, 512))
       return 0;
 
+    wkbByteOrder bo= (wkbByteOrder)wkb[0];
     res->q_append((char) wkb_ndr);
-    wkb_type= wkb_get_uint(wkb+1, (wkbByteOrder) wkb[0]);
+    wkb_type= wkb_get_uint(wkb+1, bo);
     res->q_append(wkb_type);
 
+    advance(wkb,len,WKB_HEADER_SIZE);
     if (!(geom= create_by_typeid(&buffer, wkb_type)) ||
-        !(g_len= geom->init_from_wkb(wkb + WKB_HEADER_SIZE, len,
-                                     (wkbByteOrder)  wkb[0], res)))
+        !(g_len= geom->init_from_wkb(wkb, len, bo, res)))
       return 0;
-    g_len+= WKB_HEADER_SIZE;
-    wkb+= g_len;
-    len-= g_len;
+    advance(wkb,len,g_len);
   }
   return (uint) (wkb - wkb_orig);
 }

sql/spatial.cc

@@ -7604,7 +7604,7 @@ update_ref_and_keys(THD *thd, DYNAMIC_ARRAY *keyuse,JOIN_TAB *join_tab,
 {
   uint	and_level,i;
   KEY_FIELD *key_fields, *end, *field;
-  uint sz;
+  size_t sz;
   uint m= MY_MAX(select_lex->max_equal_elems,1);
   DBUG_ENTER("update_ref_and_keys");
   DBUG_PRINT("enter", ("normal_tables: %llx", normal_tables));