Commit fbaf5b04 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 

into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug10950
parents 5d1a7fe7 4c17cdc1

configure.in

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ AC_PREREQ(2.52)dnl Minimum Autoconf version required. 


AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

# Don't forget to also update the NDB lines below.

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.0.12-beta)

AM_CONFIG_HEADER(config.h)

include/config-netware.h

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ extern "C" { 
#define HAVE_PTHREAD_YIELD_ZERO_ARG 1

#define HAVE_BROKEN_REALPATH 1



/* changes made to make use of LibC-June-2004 for building purpose */

#undef HAVE_POSIX_SIGNALS

#undef HAVE_PTHREAD_ATTR_SETSCOPE

#undef HAVE_ALLOC_A
@@ -62,6 +63,8 @@ extern "C" { 
#undef HAVE_PTHREAD_SETSCHEDPARAM

#undef HAVE_READLINK

#undef HAVE_STPCPY

/* changes  end  */



/* no libc crypt() function */

#ifdef HAVE_OPENSSL

  #define HAVE_CRYPT 1

include/m_ctype.h

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ typedef struct charset_info_st 
  uint      mbmaxlen;

  uint16    min_sort_char;

  uint16    max_sort_char; /* For LIKE optimization */

  my_bool   escape_with_backslash_is_dangerous;

  

  MY_CHARSET_HANDLER *cset;

  MY_COLLATION_HANDLER *coll;

include/my_global.h

+17 −1
Original line number Diff line number Diff line
@@ -927,7 +927,17 @@ typedef char bool; /* Ordinary boolean values 0 1 */ 


#ifndef set_timespec

#ifdef HAVE_TIMESPEC_TS_SEC

#define set_timespec(ABSTIME,SEC) { (ABSTIME).ts_sec=time(0) + (time_t) (SEC); (ABSTIME).ts_nsec=0; }

#define set_timespec(ABSTIME,SEC) \

{ \

  (ABSTIME).ts_sec=time(0) + (time_t) (SEC); \

  (ABSTIME).ts_nsec=0; \

}

#define set_timespec_nsec(ABSTIME,NSEC) \

{\

  ulonglong now= my_getsystime(); \

  (ABSTIME).ts_sec= (now / ULL(10000000)) + (NSEC / ULL(1000000000)); \

  (ABSTIME).ts_nsec= (now % ULL(10000000)) * 100 + (NSEC % ULL(1000000000)); \

}

#else

#define set_timespec(ABSTIME,SEC) \

{\
@@ -936,6 +946,12 @@ typedef char bool; /* Ordinary boolean values 0 1 */ 
  (ABSTIME).tv_sec=tv.tv_sec+(time_t) (SEC);\

  (ABSTIME).tv_nsec=tv.tv_usec*1000;\

}

#define set_timespec_nsec(ABSTIME,NSEC) \

{\

  ulonglong now= my_getsystime(); \

  (ABSTIME).tv_sec= (now / ULL(10000000)) + (NSEC / ULL(1000000000)); \

  (ABSTIME).tv_nsec= (now % ULL(10000000)) * 100 + (NSEC % ULL(1000000000)); \

}

#endif /* HAVE_TIMESPEC_TS_SEC */

#endif /* set_timespec */

innobase/btr/btr0sea.c

+7 −0
Original line number Diff line number Diff line
@@ -964,6 +964,13 @@ btr_search_drop_page_hash_index( 
	heap = NULL;

	offsets = NULL;



	if (block->index == NULL) {



		mem_analyze_corruption((byte*)block);



		ut_a(block->index != NULL);

	}



	while (!page_rec_is_supremum(rec)) {

		/* FIXME: in a mixed tree, not all records may have enough

		ordering fields: */