Commit 3910cf81 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/jonas/src/mysql-4.1
parents 2f5dce81 0f436b32

BUILD/check-cpu

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ case "$cpu_family--$model_name" in 
  *Pentium*III*CPU*)

    cpu_flag="pentium3";

  ;;

  *Pentium*M*pro*)

    cpu_flag="pentium-m";

    cpu_flag_old="pentium";

  ;;

  *Athlon*64*)

    cpu_flag="athlon64";

    cpu_flag_old="athlon";

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ hf@bisonxp.(none) 
hf@deer.(none)

hf@deer.mysql.r18.ru

hf@genie.(none)

holyfoot@mysql.com

igor@hundin.mysql.fi

igor@linux.local

igor@rurik.mysql.com

configure.in

+3 −0
Original line number Diff line number Diff line
@@ -145,8 +145,11 @@ AC_ARG_WITH(darwin-mwcc, 
  export CC CXX LD AR RANLIB

  AC_SUBST(AR)

  AC_SUBST(RANLIB)

  with_darwin_mwcc=yes

])



AM_CONDITIONAL(DARWIN_MWCC, test x$with_darwin_mwcc = xyes)



if test "x${CFLAGS-}" = x ; then

  cflags_is_set=no

else

libmysqld/Makefile.am

+4 −1
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ INC_LIB= $(top_builddir)/regex/libregex.a \ 
# generate a total libmysqld.a from all library files,



libmysqld.a:	libmysqld_int.a $(INC_LIB)

if DARWIN_MWCC

	mwld -lib -o $@ libmysqld_int.a `ls -1 $(INC_LIB) | sort -u`

else

		if test "$(host_os)" = "netware" ; \

		then \

		  $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \
@@ -104,7 +107,7 @@ libmysqld.a: libmysqld_int.a $(INC_LIB) 
		  rm -f tmp/* ; \

		  $(RANLIB) libmysqld.a	; \

		fi



endif



## XXX: any time the client interface changes, we'll need to bump

## the version info for libmysqld; however, it's possible for the

mysql-test/r/ctype_ucs.result

+18 −0
Original line number Diff line number Diff line
@@ -598,6 +598,24 @@ ucs2_bin 00610009 
ucs2_bin	0061

ucs2_bin	00610020

drop table t1;

select hex(substr(_ucs2 0x00e400e50068,1));

hex(substr(_ucs2 0x00e400e50068,1))

00E400E50068

select hex(substr(_ucs2 0x00e400e50068,2));

hex(substr(_ucs2 0x00e400e50068,2))

00E50068

select hex(substr(_ucs2 0x00e400e50068,3));

hex(substr(_ucs2 0x00e400e50068,3))

0068

select hex(substr(_ucs2 0x00e400e50068,-1));

hex(substr(_ucs2 0x00e400e50068,-1))

0068

select hex(substr(_ucs2 0x00e400e50068,-2));

hex(substr(_ucs2 0x00e400e50068,-2))

00E50068

select hex(substr(_ucs2 0x00e400e50068,-3));

hex(substr(_ucs2 0x00e400e50068,-3))

00E400E50068

SET NAMES latin1;

SET collation_connection='ucs2_swedish_ci';

CREATE TABLE t1 (Field1 int(10) default '0');