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

                   [Define the default charset name])

AC_DEFINE_UNQUOTED([MYSQL_DEFAULT_COLLATION_NAME], ["$default_collation"],

                   [Define the default charset name])

# Shall we build the UCA-based Unicode collations

AC_ARG_WITH(uca,

    [  --without-uca           Skip building of the national Unicode collations.],

    [with_uca=$withval],

    [with_uca=yes]

)

AC_MSG_CHECKING([whether to compile national Unicode collations])

if test "$with_uca" = "yes"

then

  AC_MSG_RESULT(yes)

  AC_DEFINE([HAVE_UCA_COLLATIONS], [1], [national Unicode collations])

else

  AC_MSG_RESULT(no)

fi

-- require r/have_cp932.require

disable_query_log;

show collation like "cp932_japanese_ci";

enable_query_log;

-- require r/have_eucjpms.require

disable_query_log;

show collation like "eucjpms_japanese_ci";

enable_query_log;

Collation	Charset	Id	Default	Compiled	Sortlen

cp932_japanese_ci	cp932	95	Yes	Yes	1

Collation	Charset	Id	Default	Compiled	Sortlen

eucjpms_japanese_ci	eucjpms	97	Yes	Yes	1