Commit 80edbc1d authored by unknown's avatar unknown
Browse files

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

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

storage/myisam/mi_open.c

+1 −1
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line 
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

+1 −2
Original line number Diff line number Diff line 


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