Merge remote-tracking branch 'github/10.11' into 10.11

storage/connect/CMakeLists.txt

@@ -46,7 +46,7 @@ user_connect.h valblk.h value.h xindex.h xobject.h xtable.h)
 #
 # Definitions that are shared for all OSes
 #
-add_definitions( -DMARIADB -DFORCE_INIT_OF_VARS -Dconnect_EXPORTS)
+add_definitions( -DMARIADB -Dconnect_EXPORTS)
 add_definitions( -DHUGE_SUPPORT -DGZ_SUPPORT )
 
 macro(DISABLE_WARNING W)

storage/connect/filter.cpp

@@ -1179,7 +1179,7 @@ bool FILTER::Convert(PGLOBAL g, bool having)
       case OP_GT:
       case OP_GE:
       case OP_LT:
-      case OP_LE:  new(this) FILTERCMP(g); break;
+      case OP_LE:  new(this) FILTERCMP(g, Opc); break;
       case OP_AND: new(this) FILTERAND; break;
       case OP_OR:  new(this) FILTEROR;  break;
       case OP_NOT: new(this) FILTERNOT; break;
@@ -1589,8 +1589,9 @@ void FILTER::Prints(PGLOBAL g, char *ps, uint z)
 /***********************************************************************/
 /*  FILTERCMP constructor.                                             */
 /***********************************************************************/
-FILTERCMP::FILTERCMP(PGLOBAL g)
+FILTERCMP::FILTERCMP(PGLOBAL g, OPVAL Opc)
   {
+  this->Opc= Opc;
   Bt = OpBmp(g, Opc);
   } // end of FILTERCMP constructor
 

storage/connect/filter.h

@@ -120,7 +120,7 @@ class FILTERX : public FILTER {
 class FILTERCMP : public FILTERX {
  public:
   // Constructor
-  FILTERCMP(PGLOBAL g);
+  FILTERCMP(PGLOBAL, OPVAL);
 
   // Methods
   bool Eval(PGLOBAL) override;

storage/connect/tabxml.cpp

@@ -1611,7 +1611,9 @@ bool XMLCOL::ParseXpath(PGLOBAL g, bool mode)
     if (Tdbp->Xpand)
       n = Tdbp->Limit;
 
+    auto oLong = Long;
     new(this) XMULCOL(Value);        // Change the class of this column
+    Long = oLong;
     } // endif Inod
 
   Valbuf = (char*)PlugSubAlloc(g, NULL, n * (Long + 1));

storage/maria/aria_chk.c

@@ -236,9 +236,6 @@ end:
   }
   maria_end();
   my_exit(error);
-#ifndef _lint
-  return 0;				/* No compiler warning */
-#endif
 } /* main */
 
 enum options_mc {

storage/maria/aria_pack.c

@@ -289,11 +289,9 @@ end:
   maria_end();
   my_end(verbose ? MY_CHECK_ERROR | MY_GIVE_INFO : MY_CHECK_ERROR);
   exit(error ? 2 : 0);
-#ifndef _lint
-  return 0;					/* No compiler warning */
-#endif
 }
 
+ATTRIBUTE_NORETURN
 static void my_exit(int error)
 {
   free_defaults(default_argv);

storage/maria/ma_delete.c

@@ -165,8 +165,6 @@ my_bool _ma_ck_delete(MARIA_HA *info, MARIA_KEY *key)
   MARIA_KEY org_key;
   DBUG_ENTER("_ma_ck_delete");
 
-  LINT_INIT_STRUCT(org_key);
-
   alloc_on_stack(*info->stack_end_ptr, key_buff, buff_alloced,
                  key->keyinfo->max_store_length);
   if (!key_buff)

storage/maria/ma_write.c

@@ -483,8 +483,6 @@ static my_bool _ma_ck_write_btree_with_log(MARIA_HA *info, MARIA_KEY *key,
   my_bool transactional= share->now_transactional;
   DBUG_ENTER("_ma_ck_write_btree_with_log");
   
-  LINT_INIT_STRUCT(org_key);
-
   if (transactional)
   {
     /* Save original value as the key may change */

storage/mroonga/ha_mroonga.cpp

@@ -337,7 +337,7 @@ static int mrn_change_encoding(grn_ctx *ctx, const CHARSET_INFO *charset)
   return mrn::encoding::set(ctx, charset);
 }
 
-#if defined DBUG_TRACE && !defined(_lint)
+#if defined DBUG_TRACE
 static const char *mrn_inspect_thr_lock_type(enum thr_lock_type lock_type)
 {
   const char *inspected = "<unknown>";

storage/mroonga/mrn_mysql.h

@@ -59,7 +59,7 @@
 
 #define MRN_DBUG_ENTER_FUNCTION() DBUG_ENTER(__FUNCTION__)
 
-#if !defined(DBUG_OFF) && !defined(_lint)
+#if !defined(DBUG_OFF)
 #  define MRN_DBUG_ENTER_METHOD()                 \
     char method_name[MRN_MESSAGE_BUFFER_SIZE];    \
     method_name[0] = '\0';                        \

storage/myisam/myisamchk.c

@@ -124,9 +124,6 @@ int main(int argc, char **argv)
   my_end(check_param.testflag & T_INFO ? MY_CHECK_ERROR | MY_GIVE_INFO : MY_CHECK_ERROR);
   rc= (uchar) error;
   exit(rc);
-#ifndef _lint
-  return 0;				/* No compiler warning */
-#endif
 } /* main */
 
 

storage/myisam/myisampack.c

@@ -248,9 +248,6 @@ int main(int argc, char **argv)
   free_defaults(default_argv);
   my_end(verbose ? MY_CHECK_ERROR | MY_GIVE_INFO : MY_CHECK_ERROR);
   exit(error ? 2 : 0);
-#ifndef _lint
-  return 0;					/* No compiler warning */
-#endif
 }
 
 enum options_mp {OPT_CHARSETS_DIR_MP=256};