Commit 644316ed authored by unknown's avatar unknown
Browse files

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

into  chilla.local:/home/mydev/mysql-5.1-axmrg


include/my_pthread.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/stacktrace.h:
  Auto merged
mysys/my_thr_init.c:
  Manual merge
parents 3c9b911d f4422bd4

Makefile.am

+22 −0
Original line number Diff line number Diff line
@@ -147,6 +147,28 @@ test-force-full: 
test-force-mem:

	$(MAKE) force=--force mem=--mem test



test-bt:

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	@PERL@ ./mysql-test-run.pl --comment=normal --force --timer \

	--skip-ndbcluster --report-features

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	@PERL@ ./mysql-test-run.pl  --comment=ps    --force --timer \

	--skip-ndbcluster --ps-protocol

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	@PERL@ ./mysql-test-run.pl --comment=normal+rowrepl --force --timer \

	--skip-ndbcluster --mysqld=--binlog-format=row

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	@PERL@ ./mysql-test-run.pl --comment=ps+rowrepl+NDB --force --timer \

	--ps-protocol --mysqld=--binlog-format=row

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	@PERL@ ./mysql-test-run.pl --comment=NDB            --force --timer \

	--with-ndbcluster-only



test-bt-debug:

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	@PERL@ ./mysql-test-run.pl --comment=debug  --force --timer \

	--skip-ndbcluster --skip-rpl --report-features



# Keep these for a while

test-pl:	test

test-full-pl:	test-full

client/Makefile.am

+1 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ LDADD= @CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \ 
noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h \

				client_priv.h



EXTRA_DIST =			get_password.c CMakeLists.txt

EXTRA_DIST =			get_password.c CMakeLists.txt echo.c



bin_PROGRAMS =			mysql \

				mysqladmin \
@@ -97,7 +97,6 @@ DEFS = -DUNDEF_THREADS_HACK \ 


sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc

strings_src=decimal.c

EXTRA_DIST =		get_password.c CMakeLists.txt echo.c



link_sources:

	for f in $(sql_src) ; do \

configure.in

+9 −3
Original line number Diff line number Diff line
@@ -2296,12 +2296,18 @@ AC_ARG_WITH(man, 
    [with_man=yes]

)



if test "$with_man" = "yes"

if test X"$with_man" = Xyes

then

  man_dirs="man"

  man1_files=`ls -1 $srcdir/man/*.1 | sed -e 's;^.*man/;;'`

  if test X"$have_ndbcluster" = Xyes

  then

    man1_files=`ls $srcdir/man/*.1 | sed -e 's;^.*man/;;'`

    man8_files=`ls $srcdir/man/*.8 | sed -e 's;^.*man/;;'`

  else

    man1_files=`ls $srcdir/man/*.1 | grep -v '/ndb' | sed -e 's;^.*man/;;'`

    man8_files=`ls $srcdir/man/*.8 | grep -v '/ndb' | sed -e 's;^.*man/;;'`

  fi

  man1_files=`echo $man1_files`

  man8_files=`ls -1 $srcdir/man/*.8 | sed -e 's;^.*man/;;'`

  man8_files=`echo $man8_files`

else

  man_dirs=""

include/config-win.h

+0 −14
Original line number Diff line number Diff line
@@ -425,14 +425,8 @@ inline double ulonglong2double(ulonglong value) 
#define shared_memory_buffer_length 16000

#define default_shared_memory_base_name "MYSQL"



#ifdef CYBOZU

#define MYSQL_DEFAULT_CHARSET_NAME "utf8"

#define MYSQL_DEFAULT_COLLATION_NAME "utf8_general_cs"

#define HAVE_UTF8_GENERAL_CS 1

#else

#define MYSQL_DEFAULT_CHARSET_NAME "latin1"

#define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci"

#endif



#define HAVE_SPATIAL 1

#define HAVE_RTREE_KEYS 1
@@ -443,10 +437,8 @@ inline double ulonglong2double(ulonglong value) 
/* Define charsets you want */

/* #undef HAVE_CHARSET_armscii8 */

/* #undef HAVE_CHARSET_ascii */

#ifndef CYBOZU

#define HAVE_CHARSET_big5 1

#define HAVE_CHARSET_cp1250 1

#endif

/* #undef HAVE_CHARSET_cp1251 */

/* #undef HAVE_CHARSET_cp1256 */

/* #undef HAVE_CHARSET_cp1257 */
@@ -455,33 +447,27 @@ inline double ulonglong2double(ulonglong value) 
/* #undef HAVE_CHARSET_cp866 */

#define HAVE_CHARSET_cp932 1

/* #undef HAVE_CHARSET_dec8 */

#ifndef CYBOZU

#define HAVE_CHARSET_eucjpms 1

#define HAVE_CHARSET_euckr 1

#define HAVE_CHARSET_gb2312 1

#define HAVE_CHARSET_gbk 1

#endif

/* #undef HAVE_CHARSET_greek */

/* #undef HAVE_CHARSET_hebrew */

/* #undef HAVE_CHARSET_hp8 */

/* #undef HAVE_CHARSET_keybcs2 */

/* #undef HAVE_CHARSET_koi8r */

/* #undef HAVE_CHARSET_koi8u */

#ifndef CYBOZU

#define HAVE_CHARSET_latin1 1

#define HAVE_CHARSET_latin2 1

#endif

/* #undef HAVE_CHARSET_latin5 */

/* #undef HAVE_CHARSET_latin7 */

/* #undef HAVE_CHARSET_macce */

/* #undef HAVE_CHARSET_macroman */

#define HAVE_CHARSET_sjis 1

/* #undef HAVE_CHARSET_swe7 */

#ifndef CYBOZU

#define HAVE_CHARSET_tis620 1

#define HAVE_CHARSET_ucs2 1

#define HAVE_CHARSET_ujis 1

#endif

#define HAVE_CHARSET_utf8 1

#define HAVE_UCA_COLLATIONS 1

mysys/my_thr_init.c

+1 −1
Original line number Diff line number Diff line
@@ -403,9 +403,9 @@ const char *my_thread_name(void) 


static uint get_thread_lib(void)

{

#ifdef _CS_GNU_LIBPTHREAD_VERSION

  char buff[64];

    

#ifdef _CS_GNU_LIBPTHREAD_VERSION

  confstr(_CS_GNU_LIBPTHREAD_VERSION, buff, sizeof(buff));



  if (!strncasecmp(buff, "NPTL", 4))