bzr push into mysql-6.0-falcon branch (lars-erik.bjork:2817 to 2818) Bug#39350

[lars-erik.bjork]

 2818 lars-erik.bjork@stripped	2008-09-10
      Added assert to ensure that NULL is not secretly inserted
modified:
  storage/falcon/ha_falcon.cpp

 2817 Christopher Powers	2008-09-10
      Bug #39350 Falcon: Releasing deferred indexes causes crash
      
      Removed new DeferredIndex reference counts in Transaction and DeferredIndexWalker.
modified:
  storage/falcon/DeferredIndex.cpp
  storage/falcon/DeferredIndexWalker.cpp
  storage/falcon/Transaction.cpp

=== modified file 'storage/falcon/ha_falcon.cpp'
--- a/storage/falcon/ha_falcon.cpp	2008-09-09 23:15:17 +0000
+++ b/storage/falcon/ha_falcon.cpp	2008-09-10 11:33:37 +0000
@@ -34,6 +34,7 @@
 #include "CmdGen.h"
 #include "InfoTable.h"
 #include "Format.h"
+#include "Error.h"
 
 #ifdef _WIN32
 #define I64FORMAT			"%I64d"
@@ -2641,13 +2642,7 @@ void StorageInterface::encodeRecord(ucha
 			continue;
 			
 		Field *field = fieldMap[fieldFormat->fieldId];
-
-		if (!field)
-			{
-			dataStream->encodeNull();
-			
-			continue;
-			}
+		ASSERT(field);
 		
 		if (ptrDiff)
 			field->move_field_offset(ptrDiff);