Commit 0c3d72ab authored by unknown's avatar unknown
Browse files

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

into mdk10.(none):/home/reggie/bk/mysql-4.1
parents cbd33347 e1efe797

BUILD/compile-pentium-cybozu

0 → 100755
+9 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium_cflags $fast_cflags -g"

extra_configs="$pentium_configs --with-charset=utf8 --with-collation=utf8_general_cs"



. "$path/FINISH.sh"

configure.in

+17 −10
Original line number Diff line number Diff line
@@ -2770,6 +2770,12 @@ case $default_charset in 
      ;;

    utf8)

      default_charset_default_collation="utf8_general_ci"

      if test "$default_collation" = "utf8_general_cs"; then

        # For those who explicitly desire "utf8_general_cs", support it,

        # and then also set the CPP switch enabling that code.

        UTFC="utf8_general_cs"

        AC_DEFINE([HAVE_UTF8_GENERAL_CS], [1], [certain Japanese customer])

      else

        define(UTFC1, utf8_general_ci utf8_bin)

        define(UTFC2, utf8_czech_ci utf8_danish_ci)

        define(UTFC3, utf8_estonian_ci utf8_icelandic_ci)
@@ -2780,6 +2786,7 @@ case $default_charset in 
        define(UTFC8, utf8_swedish_ci utf8_turkish_ci)

        define(UTFC9, utf8_unicode_ci)

        UTFC="UTFC1 UTFC2 UTFC3 UTFC4 UTFC5 UTFC6 UTFC7 UTFC8 UTFC9"

      fi

      default_charset_collations="$UTFC"

      ;;

    *)

mysql-test/r/ndb_basic.result

+30 −0
Original line number Diff line number Diff line
@@ -619,12 +619,18 @@ counter datavalue 
1	newval

2	newval

insert into t1 (datavalue) select datavalue from t1 where counter < 100;

insert into t1 (datavalue) select datavalue from t1 where counter < 100;

select * from t1 order by counter;

counter	datavalue

1	newval

2	newval

3	newval

4	newval

5	newval

6	newval

7	newval

8	newval

insert into t1 (datavalue) select datavalue from t1 where counter < 100;

insert into t1 (datavalue) select datavalue from t1 where counter < 100;

select * from t1 order by counter;

counter	datavalue
@@ -632,8 +638,32 @@ counter datavalue 
2	newval

3	newval

4	newval

5	newval

6	newval

7	newval

8	newval

35	newval

36	newval

37	newval

38	newval

39	newval

40	newval

41	newval

42	newval

43	newval

44	newval

45	newval

46	newval

47	newval

48	newval

49	newval

50	newval

51	newval

52	newval

53	newval

54	newval

55	newval

56	newval

57	newval

58	newval

drop table t1;

mysql-test/t/ndb_basic.test

+2 −0
Original line number Diff line number Diff line
@@ -596,9 +596,11 @@ insert into t1 (datavalue) values ('newval'); 
insert into t1 (datavalue) values ('newval');

select * from t1 order by counter;

insert into t1 (datavalue) select datavalue from t1 where counter < 100;

insert into t1 (datavalue) select datavalue from t1 where counter < 100;

select * from t1 order by counter;

connection con2;

insert into t1 (datavalue) select datavalue from t1 where counter < 100;

insert into t1 (datavalue) select datavalue from t1 where counter < 100;

select * from t1 order by counter;



drop table t1;

mysys/charset-def.c

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ extern CHARSET_INFO my_charset_utf8_slovak_uca_ci; 
extern CHARSET_INFO my_charset_utf8_spanish2_uca_ci;

extern CHARSET_INFO my_charset_utf8_roman_uca_ci;

extern CHARSET_INFO my_charset_utf8_persian_uca_ci;

#ifdef HAVE_CYBOZU_COLLATION

#ifdef HAVE_UTF8_GENERAL_CS

extern CHARSET_INFO my_charset_utf8_general_cs;

#endif

#endif
@@ -149,7 +149,7 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused))) 
#ifdef HAVE_CHARSET_utf8

  add_compiled_collation(&my_charset_utf8_general_ci);

  add_compiled_collation(&my_charset_utf8_bin);

#ifdef HAVE_CYBOZU_COLLATION

#ifdef HAVE_UTF8_GENERAL_CS

  add_compiled_collation(&my_charset_utf8_general_cs);

#endif

#ifdef HAVE_UCA_COLLATIONS