Commit d82d6c08 authored by ramil/ram@ramil.myoffice.izhnet.ru's avatar ramil/ram@ramil.myoffice.izhnet.ru
Browse files

Merge mysql.com:/home/ram/work/b29079/b29079.4.1 

into  mysql.com:/home/ram/work/b29079/b29079.5.0
parents bd80d7e4 aabbd2fb

include/my_global.h

+6 −1
Original line number Diff line number Diff line
@@ -895,7 +895,12 @@ typedef unsigned long uint32; /* Short for unsigned integer >= 32 bits */ 
typedef unsigned long	ulong;		  /* Short for unsigned long */

#endif

#ifndef longlong_defined

#if defined(HAVE_LONG_LONG) && SIZEOF_LONG != 8

/* 

  Using [unsigned] long long is preferable as [u]longlong because we use 

  [unsigned] long long unconditionally in many places, 

  for example in constants with [U]LL suffix.

*/

#if defined(HAVE_LONG_LONG) && SIZEOF_LONG_LONG == 8

typedef unsigned long long int ulonglong; /* ulong or unsigned long long */

typedef long long int	longlong;

#else