commit into MySQL/Maria:mysql-maria branch (guilhem:2646)

[Guilhem Bichot]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-maria/

 2646 Guilhem Bichot	2008-06-26
      Fixes for build errors under Windows and compiler warning under Linux
modified:
  include/m_string.h
  storage/maria/ma_check.c
  storage/maria/ma_key.c
  storage/maria/ma_sp_key.c
  storage/maria/ma_write.c

per-file comments:
  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)
=== modified file 'include/m_string.h'
--- a/include/m_string.h	2008-04-28 16:24:05 +0000
+++ b/include/m_string.h	2008-06-26 15:10:11 +0000
@@ -134,6 +134,12 @@ extern	size_t my_bcmp(const uchar *s1,co
 #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

=== modified file 'storage/maria/ma_check.c'
--- a/storage/maria/ma_check.c	2008-06-26 05:18:28 +0000
+++ b/storage/maria/ma_check.c	2008-06-26 15:10:11 +0000
@@ -4427,8 +4427,8 @@ static int sort_key_read(MARIA_SORT_PARA
   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);

=== modified file 'storage/maria/ma_key.c'
--- a/storage/maria/ma_key.c	2008-06-26 05:18:28 +0000
+++ b/storage/maria/ma_key.c	2008-06-26 15:10:11 +0000
@@ -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

=== modified file 'storage/maria/ma_sp_key.c'
--- a/storage/maria/ma_sp_key.c	2008-06-26 05:18:28 +0000
+++ b/storage/maria/ma_sp_key.c	2008-06-26 15:10:11 +0000
@@ -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
 

=== modified file 'storage/maria/ma_write.c'
--- a/storage/maria/ma_write.c	2008-06-26 05:18:28 +0000
+++ b/storage/maria/ma_write.c	2008-06-26 15:10:11 +0000
@@ -396,6 +396,7 @@ static int _ma_ck_write_btree_with_log(M
   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 */