mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes for build errors under Windows and compiler warning under Linux

Browse source 
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)
This commit is contained in:
Guilhem Bichot 2008-06-26 17:10:11 +02:00
parent 1d72603832
commit f0c53638d7
5 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/m_string.h
View file

@ -134,6 +134,12 @@ extern size_t my_bcmp(const uchar *s1,const uchar *s2,size_t len);
#define bzero_if_purify(A,B)
#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
extern void bmove512(uchar *dst,const uchar *src,size_t len);
#endif

2
storage/maria/ma_check.c
View file

@ -4427,8 +4427,8 @@ static int sort_key_read(MARIA_SORT_PARAM *sort_param, uchar *key)
int error;
MARIA_SORT_INFO *sort_info= sort_param->sort_info;
MARIA_HA *info= sort_info->info;
DBUG_ENTER("sort_key_read");
MARIA_KEY int_key;
DBUG_ENTER("sort_key_read");
if ((error=sort_get_next_record(sort_param)))
DBUG_RETURN(error);

2
storage/maria/ma_key.c
View file

@ -19,7 +19,7 @@
#include "m_ctype.h"
#include "ma_sp_defs.h"
#include "ma_blockrec.h" /* For ROW_FLAG_TRANSID */
#include <trnman.h>
#include "trnman.h"
#ifdef HAVE_IEEEFP_H
#include <ieeefp.h>
#endif

2
storage/maria/ma_sp_key.c
View file

@ -15,7 +15,7 @@
#include "maria_def.h"
#include "ma_blockrec.h" /* For ROW_FLAG_TRANSID */
#include <trnman.h>
#include "trnman.h"
#ifdef HAVE_SPATIAL

1
storage/maria/ma_write.c
View file

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