bzr push into mysql-6.0-maria branch (serg:2717 to 2718) Bug#43131

[Sergei Golubchik]

 2718 Sergei Golubchik	2009-02-24
      Bug #43131 Maria compile error 6.0-main
      fixed the "the declaration in the middle of the block" problem
modified:
  storage/maria/ma_non_trans_log.c

 2717 Sergei Golubchik	2009-02-17 [merge]
      merged
modified:
  mysql-test/suite/rpl_ndb/t/disabled.def

=== modified file 'storage/maria/ma_non_trans_log.c'
--- a/storage/maria/ma_non_trans_log.c	2009-02-13 12:40:13 +0000
+++ b/storage/maria/ma_non_trans_log.c	2009-02-24 09:29:38 +0000
@@ -244,10 +244,9 @@ void _maria_log_command(IO_CACHE *log, e
                          const uchar *buffert, uint length, int result)
 {
   uchar header[14];
-  int old_errno, headerlen;
   ulong pid=(ulong) GETPID();
   File file= share->kfile.file;
-  old_errno=my_errno;
+  int old_errno=my_errno, headerlen;
   DBUG_ENTER("_maria_log_command");
   DBUG_PRINT("enter", ("command: %u share->open_file_name.str '%s'",
                        command, share->open_file_name.str));