Commit f6cb4922 authored by unknown's avatar unknown
Browse files

Merge abarkov@bk-internal:/home/bk/mysql-5.0 

into  mysql.com:/usr/home/bar/mysql-5.0.b9278


mysql-test/t/cast.test:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
parents dc1eb889 2ef0b326

configure.in

+3 −13
Original line number Diff line number Diff line
@@ -1021,7 +1021,7 @@ case $SYSTEM_TYPE in 
  *darwin5*)

    if test "$ac_cv_prog_gcc" = "yes"

    then

      FLAGS="-traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH"

      FLAGS="-traditional-cpp -DHAVE_DARWIN5_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH"

      CFLAGS="$CFLAGS $FLAGS"

      CXXFLAGS="$CXXFLAGS $FLAGS"

      MAX_C_OPTIMIZE="-O"
@@ -1031,23 +1031,13 @@ case $SYSTEM_TYPE in 
  *darwin6*)

    if test "$ac_cv_prog_gcc" = "yes"

    then

      FLAGS="-DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH"

      FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH"

      CFLAGS="$CFLAGS $FLAGS"

      CXXFLAGS="$CXXFLAGS $FLAGS"

      MAX_C_OPTIMIZE="-O"

    fi

    ;;

  *darwin[[7-8]]*)

    # don't forget to escape [] like above

    if test "$ac_cv_prog_gcc" = "yes"

    then

      FLAGS="-DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT"

      CFLAGS="$CFLAGS $FLAGS"

      CXXFLAGS="$CXXFLAGS $FLAGS"

      MAX_C_OPTIMIZE="-O"

    fi

    ;;

  *darwin9*)

  *darwin*)

    if test "$ac_cv_prog_gcc" = "yes"

    then

      FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT"

include/config-win.h

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ typedef uint rf_SetTimer; 


/* Convert some simple functions to Posix */



#define sigset(A,B) signal((A),(B))

#define my_sigset(A,B) signal((A),(B))

#define finite(A) _finite(A)

#define sleep(A)  Sleep((A)*1000)

#define popen(A) popen(A,B) _popen((A),(B))

include/m_string.h

+0 −9
Original line number Diff line number Diff line
@@ -129,15 +129,6 @@ extern void bmove_align(gptr dst,const gptr src,uint len); 
#define bmove512(A,B,C) memcpy(A,B,C)

#endif



#ifdef HAVE_purify

#define memcpy_overlap(A,B,C) \

DBUG_ASSERT((A) <= (B) || ((B)+(C)) <= (A)); \

bmove((byte*) (A),(byte*) (B),(size_t) (C));

#else

#define memcpy_overlap(A,B,C) memcpy((A), (B), (C))

#endif /* HAVE_purify */





	/* Prototypes for string functions */



#if !defined(bfill) && !defined(HAVE_BFILL)

include/my_pthread.h

+21 −14
Original line number Diff line number Diff line
@@ -292,8 +292,6 @@ extern int my_pthread_create_detached; 
#undef HAVE_PTHREAD_RWLOCK_RDLOCK

#undef HAVE_SNPRINTF



#define sigset(A,B) pthread_signal((A),(void (*)(int)) (B))

#define signal(A,B) pthread_signal((A),(void (*)(int)) (B))

#define my_pthread_attr_setprio(A,B)

#endif /* defined(PTHREAD_SCOPE_GLOBAL) && !defined(PTHREAD_SCOPE_SYSTEM) */
@@ -325,14 +323,26 @@ extern int my_pthread_cond_init(pthread_cond_t *mp, 
#if !defined(HAVE_SIGWAIT) && !defined(HAVE_mit_thread) && !defined(HAVE_rts_threads) && !defined(sigwait) && !defined(alpha_linux_port) && !defined(HAVE_NONPOSIX_SIGWAIT) && !defined(HAVE_DEC_3_2_THREADS) && !defined(_AIX)

int sigwait(sigset_t *setp, int *sigp);		/* Use our implemention */

#endif

#if !defined(HAVE_SIGSET) && !defined(HAVE_mit_thread) && !defined(sigset)

#define sigset(A,B) do { struct sigaction s; sigset_t set;              \





/*

  We define my_sigset() and use that instead of the system sigset() so that

  we can favor an implementation based on sigaction(). On some systems, such

  as Mac OS X, sigset() results in flags such as SA_RESTART being set, and

  we want to make sure that no such flags are set.

*/

#if defined(HAVE_SIGACTION) && !defined(my_sigset)

#define my_sigset(A,B) do { struct sigaction s; sigset_t set;              \

                            sigemptyset(&set);                             \

                            s.sa_handler = (B);                            \

                            s.sa_mask    = set;                            \

                            s.sa_flags   = 0;                              \

                            sigaction((A), &s, (struct sigaction *) NULL); \

                          } while (0)

#elif defined(HAVE_SIGSET) && !defined(my_sigset)

#define my_sigset(A,B) sigset((A),(B))

#elif !defined(my_sigset)

#define my_sigset(A,B) signal((A),(B))

#endif



#ifndef my_pthread_setprio
@@ -412,16 +422,13 @@ struct tm *gmtime_r(const time_t *clock, struct tm *res); 
#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(&tmp); }

#endif



#ifdef HAVE_DARWIN_THREADS

#ifdef HAVE_DARWIN5_THREADS

#define pthread_sigmask(A,B,C) sigprocmask((A),(B),(C))

#define pthread_kill(A,B) pthread_dummy(0)

#define pthread_condattr_init(A) pthread_dummy(0)

#define pthread_condattr_destroy(A) pthread_dummy(0)

#define pthread_signal(A,B) pthread_dummy(0)

#undef	pthread_detach_this_thread

#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(tmp); }

#undef sigset

#define sigset(A,B) pthread_signal((A),(void (*)(int)) (B))

#endif



#if ((defined(HAVE_PTHREAD_ATTR_CREATE) && !defined(HAVE_SIGWAIT)) || defined(HAVE_DEC_3_2_THREADS)) && !defined(HAVE_CTHREADS_WRAPPER)

myisam/mi_search.c

+1 −1
Original line number Diff line number Diff line
@@ -986,7 +986,7 @@ uint _mi_get_binary_pack_key(register MI_KEYDEF *keyinfo, uint nod_flag, 
    }

    DBUG_PRINT("info",("key: %lx  from: %lx  length: %u",

		       (long) key, (long) from, length));

    memcpy_overlap((byte*) key, (byte*) from, (size_t) length);

    memmove((byte*) key, (byte*) from, (size_t) length);

    key+=length;

    from+=length;

  }