Commit 24e1d1c8 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-xa 

into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa


sql/ha_innodb.cc:
  Auto merged
parents e1f13fb2 042448aa

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -1914,7 +1914,7 @@ AC_CHECK_FUNCS(alarm bcmp bfill bmove bzero chsize cuserid fchmod fcntl \ 
  getcwd gethostbyaddr_r gethostbyname_r getpass getpassphrase getpwnam \

  getpwuid getrlimit getrusage getwd gmtime_r index initgroups isnan \

  localtime_r locking longjmp lrand48 madvise mallinfo memcpy memmove \

  mkstemp mlockall perror poll pread pthread_attr_create mmap \

  mkstemp mlockall perror poll pread pthread_attr_create mmap getpagesize \

  pthread_attr_getstacksize pthread_attr_setprio pthread_attr_setschedparam \

  pthread_attr_setstacksize pthread_condattr_create pthread_getsequence_np \

  pthread_key_delete pthread_rwlock_rdlock pthread_setprio \

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ typedef long int32; 
#endif

typedef unsigned long	uint32; /* Short for unsigned integer >= 32 bits */

#else

error "Neither int or long is of 4 bytes width"

#error "Neither int or long is of 4 bytes width"

#endif



#if !defined(HAVE_ULONG) && !defined(HAVE_LINUXTHREADS) && !defined(__USE_MISC)

include/my_pthread.h

+1 −1
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ static inline bool thread_safe_dec_and_test(ulong &V, pthread_mutex_t *L) 
{

  ulong res;

  pthread_mutex_lock(L);

  res=V--;

  res=--V;

  pthread_mutex_unlock(L);

  return res==0;

}

libmysqld/libmysqld.rc

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

libmysqld/resource.h

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file