After merge fix

BitKeeper/etc/ignore:
  added extra/mysql_waitpid

.bzrignore

@@ -522,3 +522,4 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
+extra/mysql_waitpid

myisam/mi_create.c

@@ -449,7 +449,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
   share.base.keystart = share.state.state.key_file_length=
     MY_ALIGN(info_length, myisam_block_size);
   share.base.max_key_block_length=max_key_block_length;
-  share.base.max_key_length=ALIGN_SIZE(max_key_length[+4);
+  share.base.max_key_length=ALIGN_SIZE(max_key_length+4);
   share.base.records=ci->max_rows;
   share.base.reloc=  ci->reloc_rows;
   share.base.reclength=real_reclength;

mysql-test/r/group_by.result

@@ -467,3 +467,17 @@ NOT NULL);
 max(value)
 4
 drop table t1,t2,t3;
+create table t1 (a blob null);
+insert into t1 values (NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(""),(""),(""),("b");
+select a,count(*) from t1 group by a;
+a	count(*)
+NULL	9
+	3
+b	1
+set option sql_big_tables=1;
+select a,count(*) from t1 group by a;
+a	count(*)
+NULL	9
+	3
+b	1
+drop table t1;