Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  mysql.com:/opt/local/work/mysql-5.1-merge

storage/myisam/mi_open.c

@@ -96,7 +96,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
   bzero((byte*) &info,sizeof(info));
 
   my_realpath(name_buff, fn_format(org_name,name,"",MI_NAME_IEXT,
-                                   MY_UNPACK_FILENAME|MY_APPEND_EXT),MYF(0));
+                                   MY_UNPACK_FILENAME),MYF(0));
   pthread_mutex_lock(&THR_LOCK_myisam);
   if (!(old_info=test_if_reopen(name_buff)))
   {

unittest/examples/Makefile.am

-AM_CPPFLAGS        = -I$(srcdir) -I$(top_builddir)/include
-AM_CPPFLAGS       += -I$(top_srcdir)/unittest/mytap
+AM_CPPFLAGS        = -I$(srcdir) -I$(top_builddir)/include \
+		     -I$(top_srcdir)/unittest/mytap -I$(top_srcdir)/include
 
 AM_LDFLAGS         = -L$(top_builddir)/unittest/mytap
 

unittest/mytap/t/Makefile.am

 
-AM_CPPFLAGS     = -I$(srcdir) -I$(top_builddir)/include
-AM_CPPFLAGS    += -I$(srcdir)/..
+AM_CPPFLAGS     = -I$(srcdir) -I$(top_builddir)/include -I$(srcdir)/.. -I$(top_srcdir)/include
 
 AM_LDFLAGS      = -L$(top_builddir)/unittest/mytap