post-merge fixes

myisam/mi_dynrec.c:
  included assert.h
mysql-test/r/isam.result:
  results updated

myisam/mi_dynrec.c

@@ -17,6 +17,7 @@
 	/* Functions to handle space-packed-records and blobs */
 
 #include "myisamdef.h"
+#include <assert.h>
 
 /* Enough for comparing if number is zero */
 static char zero_string[]={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};