Merge branch '10.6' into bb-10.11-release

Author: sanja-byelkin

mysql-test/main/gis.result

@@ -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.test

@@ -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/suite/s3/debug.result

@@ -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

sql/spatial.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/sql_select.cc

@@ -7442,7 +7442,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));