Commit 8ae95213 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/my/mysql-5.0


sql/sp_head.cc:
  Auto merged
sql/sp_rcontext.cc:
  Auto merged
parents cdb905ea 29f18223

extra/yassl/taocrypt/include/type_traits.hpp

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ MK_FUNDAMENTAL_TYPE(float) 
MK_FUNDAMENTAL_TYPE(     double)

MK_FUNDAMENTAL_TYPE(long double)



#ifdef WORD64_AVAILABLE

#if defined(WORD64_AVAILABLE) && defined(WORD64_IS_DISTINCT_TYPE)

    MK_FUNDAMENTAL_TYPE(word64)

#endif

extra/yassl/taocrypt/include/types.hpp

+2 −0
Original line number Diff line number Diff line
@@ -45,10 +45,12 @@ typedef unsigned int word32; 


#if defined(__GNUC__) || defined(__MWERKS__) || defined(_LONGLONG_TYPE)

    #define WORD64_AVAILABLE

    #define WORD64_IS_DISTINCT_TYPE

    typedef unsigned long long word64;

    #define W64LIT(x) x##LL

#elif defined(_MSC_VER) || defined(__BCPLUSPLUS__)

    #define WORD64_AVAILABLE

    #define WORD64_IS_DISTINCT_TYPE

    typedef unsigned __int64 word64;

    #define W64LIT(x) x##ui64

#elif defined(__DECCXX)

extra/yassl/taocrypt/src/misc.cpp

+2 −1
Original line number Diff line number Diff line
@@ -149,7 +149,8 @@ unsigned long Crop(unsigned long value, unsigned int size) 
}





#if !(defined(_MSC_VER) && (_MSC_VER < 1300))

#if !(defined(_MSC_VER) && (_MSC_VER < 1300)) && \

    !(defined(__HP_aCC) && (__HP_aCC <= 35700))

using std::new_handler;

using std::set_new_handler;

#endif

include/config-win.h

+0 −1
Original line number Diff line number Diff line
@@ -392,7 +392,6 @@ inline double ulonglong2double(ulonglong value) 
/* #undef HAVE_CHARSET_armscii8 */

/* #undef HAVE_CHARSET_ascii */

#define HAVE_CHARSET_big5 1

#define HAVE_CHARSET_cp932

#define HAVE_CHARSET_cp1250 1

/* #undef HAVE_CHARSET_cp1251 */

/* #undef HAVE_CHARSET_cp1256 */

mysql-test/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ dist-hook: 
	mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \

		$(distdir)/std_data $(distdir)/lib

	$(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.sql $(distdir)/t

	-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(srcdir)/t/*.slave-mi $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include