Index: src/backend/catalog/index.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/catalog/index.c,v
retrieving revision 1.300
diff -c -r1.300 index.c
*** src/backend/catalog/index.c	19 Jun 2008 00:46:04 -0000	1.300
--- src/backend/catalog/index.c	23 Jun 2008 19:34:54 -0000
***************
*** 262,267 ****
--- 262,278 ----
  
  			ReleaseSysCache(tuple);
  		}
+ 
+ 		/*
+ 		 * For an index on NAME, force the index storage to be CSTRING,
+ 		 * rather than padded to fixed length.
+ 		 */
+ 		if (to->atttypid == NAMEOID)
+ 		{
+ 			to->atttypid = CSTRINGOID;
+ 			to->attlen = -2;
+ 			to->attalign = 'c';
+ 		}
  	}
  
  	return indexTupDesc;