Merge mysql.com:/usr/home/ram/work/4.1.b4214

into  mysql.com:/usr/home/ram/work/mysql-5.0


myisam/mi_check.c:
  Auto merged
myisam/mi_packrec.c:
  Auto merged
myisam/mi_static.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
myisam/myisampack.c:
  merging

10 files changed, 107 insertions, 104 deletions

diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index ffb7cdd503f..ee64f9b9979 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -3194,9 +3194,11 @@ int sort_write_record(MI_SORT_PARAM *sort_param)
       break;
     case COMPRESSED_RECORD:
       reclength=info->packed_length;
-      length=save_pack_length(block_buff,reclength);
+      length= save_pack_length((uint) share->pack.version, block_buff,
+                               reclength);
       if (info->s->base.blobs)
-	length+=save_pack_length(block_buff+length,info->blob_length);
+	length+= save_pack_length((uint) share->pack.version,
+	                          block_buff + length, info->blob_length);
       if (my_b_write(&info->rec_cache,block_buff,length) ||
 	  my_b_write(&info->rec_cache,(byte*) sort_param->rec_buff,reclength))
       {
diff --git a/myisam/mi_packrec.c b/myisam/mi_packrec.c
index c251e4dda4a..e242e9d506d 100644
--- a/myisam/mi_packrec.c
+++ b/myisam/mi_packrec.c
@@ -151,11 +151,12 @@ my_bool _mi_read_pack_info(MI_INFO *info, pbool fix_keys)
       my_errno=HA_ERR_END_OF_FILE;
     goto err0;
   }
-  if (memcmp((byte*) header,(byte*) myisam_pack_file_magic,4))
+  if (memcmp((byte*) header, (byte*) myisam_pack_file_magic, 3))
   {
     my_errno=HA_ERR_WRONG_IN_RECORD;
     goto err0;
   }
+  share->pack.version= header[3];
   share->pack.header_length=	uint4korr(header+4);
   share->min_pack_length=(uint) uint4korr(header+8);
   share->max_pack_length=(uint) uint4korr(header+12);
@@ -1070,38 +1071,12 @@ uint _mi_pack_get_block_info(MI_INFO *myisam, MI_BLOCK_INFO *info, File file,
       return BLOCK_FATAL_ERROR;
     DBUG_DUMP("header",(byte*) header,ref_length);
   }
-  if (header[0] < 254)
-  {
-    info->rec_len=header[0];
-    head_length=1;
-  }
-  else if (header[0] == 254)
-  {
-    info->rec_len=uint2korr(header+1);
-    head_length=3;
-  }
-  else
-  {
-    info->rec_len=uint3korr(header+1);
-    head_length=4;
-  }
+  head_length= read_pack_length((uint) myisam->s->pack.version, header,
+                                &info->rec_len);
   if (myisam->s->base.blobs)
   {
-    if (header[head_length] < 254)
-    {
-      info->blob_len=header[head_length];
-      head_length++;
-    }
-    else if (header[head_length] == 254)
-    {
-      info->blob_len=uint2korr(header+head_length+1);
-      head_length+=3;
-    }
-    else
-    {
-      info->blob_len=uint3korr(header+head_length+1);
-      head_length+=4;
-    }
+    head_length+= read_pack_length((uint) myisam->s->pack.version,
+                                   header + head_length, &info->blob_len);
     if (!(mi_alloc_rec_buff(myisam,info->rec_len + info->blob_len,
 			    &myisam->rec_buff)))
       return BLOCK_FATAL_ERROR;			/* not enough memory */
@@ -1251,34 +1226,12 @@ void _mi_unmap_file(MI_INFO *info)
 static uchar *_mi_mempack_get_block_info(MI_INFO *myisam,MI_BLOCK_INFO *info,
 					 uchar *header)
 {
-  if (header[0] < 254)
-    info->rec_len= *header++;
-  else if (header[0] == 254)
-  {
-    info->rec_len=uint2korr(header+1);
-    header+=3;
-  }
-  else
-  {
-    info->rec_len=uint3korr(header+1);
-    header+=4;
-  }
+  header+= read_pack_length((uint) myisam->s->pack.version, header,
+                            &info->rec_len);
   if (myisam->s->base.blobs)
   {
-    if (header[0] < 254)
-    {
-      info->blob_len= *header++;
-    }
-    else if (header[0] == 254)
-    {
-      info->blob_len=uint2korr(header+1);
-      header+=3;
-    }
-    else
-    {
-      info->blob_len=uint3korr(header+1);
-      header+=4;
-    }
+    header+= read_pack_length((uint) myisam->s->pack.version, header,
+                              &info->blob_len);
     /* mi_alloc_rec_buff sets my_errno on error */
     if (!(mi_alloc_rec_buff(myisam, info->blob_len,
 			    &myisam->rec_buff)))
@@ -1350,7 +1303,7 @@ static int _mi_read_rnd_mempack_record(MI_INFO *info, byte *buf,
 
 	/* Save length of row */
 
-uint save_pack_length(byte *block_buff,ulong length)
+uint save_pack_length(uint version, byte *block_buff, ulong length)
 {
   if (length < 254)
   {
@@ -1364,6 +1317,46 @@ uint save_pack_length(byte *block_buff,ulong length)
     return 3;
   }
   *(uchar*) block_buff=255;
-  int3store(block_buff+1,(ulong) length);
-  return 4;
+  if (version == 1) /* old format */
+  {
+    DBUG_ASSERT(length <= 0xFFFFFF);
+    int3store(block_buff + 1, (ulong) length);
+    return 4;
+  }
+  else
+  {
+    int4store(block_buff + 1, (ulong) length);
+    return 5;
+  }
+}
+
+
+uint read_pack_length(uint version, const uchar *buf, ulong *length)
+{
+  if (buf[0] < 254)
+  {
+    *length= buf[0];
+    return 1;
+  }
+  else if (buf[0] == 254)
+  {
+    *length= uint2korr(buf + 1);
+    return 3;
+  }
+  if (version == 1) /* old format */
+  {
+    *length= uint3korr(buf + 1);
+    return 4;
+  }
+  else
+  {
+    *length= uint4korr(buf + 1);
+    return 5;
+  }
+}
+
+
+uint calc_pack_length(uint version, ulong length)
+{
+  return (length < 254) ? 1 : (length < 65536) ? 3 : (version == 1) ? 4 : 5;
 }
diff --git a/myisam/mi_static.c b/myisam/mi_static.c
index 4c9d814f7d6..fc585eb5543 100644
--- a/myisam/mi_static.c
+++ b/myisam/mi_static.c
@@ -27,7 +27,7 @@ LIST	*myisam_open_list=0;
 uchar	NEAR myisam_file_magic[]=
 { (uchar) 254, (uchar) 254,'\007', '\001', };
 uchar	NEAR myisam_pack_file_magic[]=
-{ (uchar) 254, (uchar) 254,'\010', '\001', };
+{ (uchar) 254, (uchar) 254,'\010', '\002', };
 my_string myisam_log_filename=(char*) "myisam.log";
 File	myisam_log_file= -1;
 uint	myisam_quick_table_bits=9;
diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h
index 74463ec065a..82f7fd7360e 100644
--- a/myisam/myisamdef.h
+++ b/myisam/myisamdef.h
@@ -149,6 +149,7 @@ typedef struct st_mi_blob		/* Info of record */
 typedef struct st_mi_isam_pack {
   ulong header_length;
   uint ref_length;
+  uchar version;
 } MI_PACK;
 
 
@@ -673,7 +674,9 @@ extern void _myisam_log_record(enum myisam_log_commands command,MI_INFO *info,
 extern void mi_report_error(int errcode, const char *file_name);
 extern my_bool _mi_memmap_file(MI_INFO *info);
 extern void _mi_unmap_file(MI_INFO *info);
-extern uint save_pack_length(byte *block_buff,ulong length);
+extern uint save_pack_length(uint version, byte *block_buff, ulong length);
+extern uint read_pack_length(uint version, const uchar *buf, ulong *length);
+extern uint calc_pack_length(uint version, ulong length);
 
 uint mi_state_info_write(File file, MI_STATE_INFO *state, uint pWrite);
 char *mi_state_info_read(uchar *ptr, MI_STATE_INFO *state);
diff --git a/myisam/myisampack.c b/myisam/myisampack.c
index b8f21392f8a..3b091cd6ea2 100644
--- a/myisam/myisampack.c
+++ b/myisam/myisampack.c
@@ -2417,6 +2417,7 @@ static int compress_isam_file(PACK_MRG_INFO *mrg, HUFF_COUNTS *huff_counts)
   HUFF_COUNTS *count,*end_count;
   HUFF_TREE *tree;
   MI_INFO *isam_file=mrg->file[0];
+  uint pack_version= (uint) isam_file->s->pack.version;
   DBUG_ENTER("compress_isam_file");
 
   /* Allocate a buffer for the records (excluding blobs). */
@@ -2455,25 +2456,11 @@ static int compress_isam_file(PACK_MRG_INFO *mrg, HUFF_COUNTS *huff_counts)
 	  huff_counts[i].tree->height+huff_counts[i].length_bits;
   }
   max_calc_length= (max_calc_length + 7) / 8;
-  if (max_calc_length < 254)
-    pack_ref_length=1;
-  else if (max_calc_length <= 65535)
-    pack_ref_length=3;
-  else
-    pack_ref_length=4;
-
+  pack_ref_length= calc_pack_length(pack_version, max_calc_length);
   record_count=0;
   /* 'max_blob_length' is the max length of all blobs of a record. */
-  pack_blob_length=0;
-  if (isam_file->s->base.blobs)
-  {
-    if (mrg->max_blob_length < 254)
-      pack_blob_length=1;
-    else if (mrg->max_blob_length <= 65535)
-      pack_blob_length=3;
-    else
-      pack_blob_length=4;
-  }
+  pack_blob_length= isam_file->s->base.blobs ?
+                    calc_pack_length(pack_version, mrg->max_blob_length) : 0;
   max_pack_length=pack_ref_length+pack_blob_length;
 
   DBUG_PRINT("fields", ("==="));
@@ -2746,9 +2733,10 @@ static int compress_isam_file(PACK_MRG_INFO *mrg, HUFF_COUNTS *huff_counts)
       }
       flush_bits();
       length=(ulong) ((byte*) file_buffer.pos - record_pos) - max_pack_length;
-      pack_length=save_pack_length(record_pos,length);
+      pack_length= save_pack_length(pack_version, record_pos, length);
       if (pack_blob_length)
-	pack_length+=save_pack_length(record_pos+pack_length,tot_blob_length);
+	pack_length+= save_pack_length(pack_version, record_pos + pack_length,
+	                               tot_blob_length);
       DBUG_PRINT("fields", ("record: %lu  length: %lu  blob-length: %lu  "
                             "length-bytes: %lu", (ulong) record_count, length,
                             tot_blob_length, pack_length));
diff --git a/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp b/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
index ba6d65ca838..b7e2ab072b5 100644
--- a/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
+++ b/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
@@ -134,7 +134,9 @@ bool PrepareOperationRecord::check() {
   return true;
 }
 
-Uint32 PrepareOperationRecord::getLogRecordSize() {
+Uint32 PrepareOperationRecord::getLogRecordSize(Uint32 wordsRead) {
+  if (wordsRead < 2)
+    return 2; // make sure we read more
   return m_logRecordSize;
 }
 
diff --git a/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp b/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
index 11b8dc4a6fa..b2da7427f4e 100644
--- a/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
+++ b/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
@@ -83,7 +83,7 @@ class PrepareOperationRecord {
   friend NdbOut& operator<<(NdbOut&, const PrepareOperationRecord&);
 public:
   bool check();
-  Uint32 getLogRecordSize();
+  Uint32 getLogRecordSize(Uint32 wordsRead);
 
 protected:
   Uint32 m_recordType;
diff --git a/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp b/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp
index aa8b1d25e4e..751d27db74e 100644
--- a/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp
+++ b/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp
@@ -41,6 +41,7 @@ void doExit();
 
 FILE * f= 0;
 char fileName[256];
+bool theDumpFlag = false;
 bool thePrintFlag = true;
 bool theCheckFlag = true;
 bool onlyPageHeaders = false;
@@ -208,7 +209,7 @@ NDB_COMMAND(redoLogFileReader,  "redoLogFileReader", "redoLogFileReader", "Read
 
 	case ZPREP_OP_TYPE:
 	  poRecord = (PrepareOperationRecord *) redoLogPagePos;
-	  wordIndex += poRecord->getLogRecordSize();
+	  wordIndex += poRecord->getLogRecordSize(PAGESIZE-wordIndex);
 	  if (wordIndex <= PAGESIZE) {
 	    if (thePrintFlag) ndbout << (*poRecord);
 	    if (theCheckFlag) {
@@ -277,10 +278,9 @@ NDB_COMMAND(redoLogFileReader,  "redoLogFileReader", "redoLogFileReader", "Read
 	  ndbout << " ------ERROR: UNKNOWN RECORD TYPE------" << endl;
 
 	  // Print out remaining data in this page
-	  for (int j = wordIndex; j < PAGESIZE; j++){
-	    Uint32 unknown = redoLogPage[i*PAGESIZE + j];
-
-	    ndbout_c("%-30d%-12u%-12x", j, unknown, unknown);
+	  for (int k = wordIndex; k < PAGESIZE; k++){
+	    Uint32 unknown = redoLogPage[i*PAGESIZE + k];
+	    ndbout_c("%-30d%-12u%-12x", k, unknown, unknown);
 	  }
 	  
 	  doExit();
@@ -289,8 +289,19 @@ NDB_COMMAND(redoLogFileReader,  "redoLogFileReader", "redoLogFileReader", "Read
 
 
       if (lastPage)
+      {
+	if (theDumpFlag)
+	{
+	  ndbout << " ------PAGE END: DUMPING REST OF PAGE------" << endl;
+	  for (int k = wordIndex > PAGESIZE ? oldWordIndex : wordIndex;
+	       k < PAGESIZE; k++)
+	  {
+	    Uint32 word = redoLogPage[i*PAGESIZE + k];
+	    ndbout_c("%-30d%-12u%-12x", k, word, word);
+	  }
+	}
 	break;
-	
+      }
       if (wordIndex > PAGESIZE) {
 	words_from_previous_page = PAGESIZE - oldWordIndex;
 	ndbout << " ----------- Record continues on next page -----------" << endl;
@@ -353,6 +364,8 @@ void readArguments(int argc, const char** argv)
     {
       if (strcmp(argv[i], "-noprint") == 0) {
 	thePrintFlag = false;
+      } else if (strcmp(argv[i], "-dump") == 0) {
+	theDumpFlag = true;
       } else if (strcmp(argv[i], "-nocheck") == 0) {
 	theCheckFlag = false;
       } else if (strcmp(argv[i], "-mbyteheaders") == 0) {
diff --git a/ndb/src/kernel/main.cpp b/ndb/src/kernel/main.cpp
index f679646e14a..b35929247d9 100644
--- a/ndb/src/kernel/main.cpp
+++ b/ndb/src/kernel/main.cpp
@@ -60,7 +60,7 @@ int main(int argc, char** argv)
   NDB_INIT(argv[0]);
   // Print to stdout/console
   g_eventLogger.createConsoleHandler();
-  g_eventLogger.setCategory("NDB");
+  g_eventLogger.setCategory("ndbd");
   g_eventLogger.enable(Logger::LL_ON, Logger::LL_CRITICAL);
   g_eventLogger.enable(Logger::LL_ON, Logger::LL_ERROR);
   g_eventLogger.enable(Logger::LL_ON, Logger::LL_WARNING);
diff --git a/ndb/src/kernel/vm/Emulator.cpp b/ndb/src/kernel/vm/Emulator.cpp
index d6ed6c0dafd..f52233fc276 100644
--- a/ndb/src/kernel/vm/Emulator.cpp
+++ b/ndb/src/kernel/vm/Emulator.cpp
@@ -30,13 +30,15 @@
 #include <NodeState.hpp>
 
 #include <NdbMem.h>
-#include <NdbOut.hpp>
 #include <NdbMutex.h>
 #include <NdbSleep.h>
 
+#include <EventLogger.hpp>
+
 extern "C" {
   extern void (* ndb_new_handler)();
 }
+extern EventLogger g_eventLogger;
 
 /**
  * Declare the global variables 
@@ -141,23 +143,23 @@ NdbShutdown(NdbShutdownType type,
     
     switch(type){
     case NST_Normal:
-      ndbout << "Shutdown initiated" << endl;
+      g_eventLogger.info("Shutdown initiated");
       break;
     case NST_Watchdog:
-      ndbout << "Watchdog " << shutting << " system" << endl;
+      g_eventLogger.info("Watchdog %s system", shutting);
       break;
     case NST_ErrorHandler:
-      ndbout << "Error handler " << shutting << " system" << endl;
+      g_eventLogger.info("Error handler %s system", shutting);
       break;
     case NST_ErrorHandlerSignal:
-      ndbout << "Error handler signal " << shutting << " system" << endl;
+      g_eventLogger.info("Error handler signal %s system", shutting);
       break;
     case NST_Restart:
-      ndbout << "Restarting system" << endl;
+      g_eventLogger.info("Restarting system");
       break;
     default:
-      ndbout << "Error handler " << shutting << " system"
-	     << " (unknown type: " << (unsigned)type << ")" << endl;
+      g_eventLogger.info("Error handler %s system (unknown type: %u)",
+			 shutting, (unsigned)type);
       type = NST_ErrorHandler;
       break;
     }
@@ -173,7 +175,7 @@ NdbShutdown(NdbShutdownType type,
       /**
        * Very serious, don't attempt to free, just die!!
        */
-      ndbout << "Watchdog shutdown completed - " << exitAbort << endl;
+      g_eventLogger.info("Watchdog shutdown completed - %s", exitAbort);
 #if defined VM_TRACE && ( ! ( defined NDB_OSE || defined NDB_SOFTOSE) )
       signal(6, SIG_DFL);
       abort();
@@ -227,7 +229,7 @@ NdbShutdown(NdbShutdownType type,
     }
     
     if(type != NST_Normal && type != NST_Restart){
-      ndbout << "Error handler shutdown completed - " << exitAbort << endl;
+      g_eventLogger.info("Error handler shutdown completed - %s", exitAbort);
 #if ( defined VM_TRACE || defined ERROR_INSERT ) && ( ! ( defined NDB_OSE || defined NDB_SOFTOSE) )
       signal(6, SIG_DFL);
       abort();
@@ -243,7 +245,7 @@ NdbShutdown(NdbShutdownType type,
       exit(restartType);
     }
     
-    ndbout << "Shutdown completed - exiting" << endl;
+    g_eventLogger.info("Shutdown completed - exiting");
   } else {
     /**
      * Shutdown is already in progress
@@ -253,7 +255,7 @@ NdbShutdown(NdbShutdownType type,
      * If this is the watchdog, kill system the hard way
      */
     if (type== NST_Watchdog){
-      ndbout << "Watchdog is killing system the hard way" << endl;
+      g_eventLogger.info("Watchdog is killing system the hard way");
 #if defined VM_TRACE && ( ! ( defined NDB_OSE || defined NDB_SOFTOSE) )
       signal(6, SIG_DFL);
       abort();