Commit f0c53638 authored by Guilhem Bichot's avatar Guilhem Bichot

Fixes for build errors under Windows and compiler warning under Linux

include/m_string.h:
  new macro like LINT_INIT but for struct. In m_string.h because bzero() becomes available only there
storage/maria/ma_check.c:
  compiler error under Windows (declaration after statements...)
storage/maria/ma_key.c:
  trnman.h is not in include/ but in storage/maria
storage/maria/ma_sp_key.c:
  trnman.h is not in include/ but in storage/maria
storage/maria/ma_write.c:
  avoid compiler warning (org_key.flag may be used uninitialized)
parent 1d726038
No related merge requests found
...@@ -134,6 +134,12 @@ extern size_t my_bcmp(const uchar *s1,const uchar *s2,size_t len); ...@@ -134,6 +134,12 @@ extern size_t my_bcmp(const uchar *s1,const uchar *s2,size_t len);
#define bzero_if_purify(A,B) #define bzero_if_purify(A,B)
#endif /* HAVE_purify */ #endif /* HAVE_purify */
#if defined(_lint) || defined(FORCE_INIT_OF_VARS)
#define LINT_INIT_STRUCT(var) bzero(&var, sizeof(var)) /* No uninitialize-warning */
#else
#define LINT_INIT_STRUCT(var)
#endif
#ifndef bmove512 #ifndef bmove512
extern void bmove512(uchar *dst,const uchar *src,size_t len); extern void bmove512(uchar *dst,const uchar *src,size_t len);
#endif #endif
......
...@@ -4427,8 +4427,8 @@ static int sort_key_read(MARIA_SORT_PARAM *sort_param, uchar *key) ...@@ -4427,8 +4427,8 @@ static int sort_key_read(MARIA_SORT_PARAM *sort_param, uchar *key)
int error; int error;
MARIA_SORT_INFO *sort_info= sort_param->sort_info; MARIA_SORT_INFO *sort_info= sort_param->sort_info;
MARIA_HA *info= sort_info->info; MARIA_HA *info= sort_info->info;
DBUG_ENTER("sort_key_read");
MARIA_KEY int_key; MARIA_KEY int_key;
DBUG_ENTER("sort_key_read");
if ((error=sort_get_next_record(sort_param))) if ((error=sort_get_next_record(sort_param)))
DBUG_RETURN(error); DBUG_RETURN(error);
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "m_ctype.h" #include "m_ctype.h"
#include "ma_sp_defs.h" #include "ma_sp_defs.h"
#include "ma_blockrec.h" /* For ROW_FLAG_TRANSID */ #include "ma_blockrec.h" /* For ROW_FLAG_TRANSID */
#include <trnman.h> #include "trnman.h"
#ifdef HAVE_IEEEFP_H #ifdef HAVE_IEEEFP_H
#include <ieeefp.h> #include <ieeefp.h>
#endif #endif
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include "maria_def.h" #include "maria_def.h"
#include "ma_blockrec.h" /* For ROW_FLAG_TRANSID */ #include "ma_blockrec.h" /* For ROW_FLAG_TRANSID */
#include <trnman.h> #include "trnman.h"
#ifdef HAVE_SPATIAL #ifdef HAVE_SPATIAL
......
...@@ -396,6 +396,7 @@ static int _ma_ck_write_btree_with_log(MARIA_HA *info, MARIA_KEY *key, ...@@ -396,6 +396,7 @@ static int _ma_ck_write_btree_with_log(MARIA_HA *info, MARIA_KEY *key,
MARIA_KEY org_key; MARIA_KEY org_key;
DBUG_ENTER("_ma_ck_write_btree_with_log"); DBUG_ENTER("_ma_ck_write_btree_with_log");
LINT_INIT_STRUCT(org_key);
if (share->now_transactional) if (share->now_transactional)
{ {
/* Save original value as the key may change */ /* Save original value as the key may change */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment