Commit 3a13246c authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/my/mysql-5.0
parents edbef416 332b0609

Build-tools/Do-compile

+14 −14
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ $opt_distribution=$opt_user=$opt_config_env=$opt_config_extra_env=""; 
$opt_dbd_options=$opt_perl_options=$opt_config_options=$opt_make_options=$opt_suffix="";

$opt_tmp=$opt_version_suffix="";

$opt_bundled_zlib=$opt_help=$opt_delete=$opt_debug=$opt_stage=$opt_no_test=$opt_no_perl=$opt_one_error=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=$opt_with_archive=$opt_with_cluster=$opt_with_csv=$opt_with_example=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=$opt_readline=0;

$opt_embedded_test=$opt_ps_test=$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=$opt_clearlogs=0;

$opt_skip_embedded_test=$opt_skip_ps_test=$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=$opt_clearlogs=0;



GetOptions(

	"bdb",
@@ -25,7 +25,6 @@ GetOptions( 
	"delete",

	"distribution=s",

	"enable-shared",

	"embedded-test",

	"fast-benchmark",

	"help|Information",

	"innodb",
@@ -41,9 +40,10 @@ GetOptions( 
	"one-error",

	"perl-files=s",

	"perl-options=s",

 	"ps-test",

	"raid",

	"readline",

	"skip-embedded-test",

 	"skip-ps-test",

	"stage=i",

	"static-client",

	"static-perl",
@@ -278,7 +278,7 @@ if ($opt_stage <= 1) 
		$opt_config_options.= " --with-libedit";

	}

  $opt_config_options.= " --with-embedded-server" unless ($opt_without_embedded);

  $opt_embedded_test= 0 if ($opt_without_embedded);

  $opt_skip_embedded_test= 1 if ($opt_without_embedded);

  $opt_config_options.= " --with-archive-storage-engine" if ($opt_with_archive);

  $opt_config_options.= " --with-ndbcluster" if ($opt_with_cluster);

  $opt_config_options.= " --with-csv-storage-engine" if ($opt_with_csv);
@@ -391,14 +391,14 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest) 
  safe_cd("${test_dir}/mysql-test");

  check_system("./mysql-test-run $flags --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");



  if ($opt_ps_test)

  unless ($opt_skip_ps_test)

  {

    log_timestamp();

    info("Running test suite using prepared statements");

    check_system("./mysql-test-run $flags --ps-protocol --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");

  }

  

  if ($opt_embedded_test)

  unless ($opt_skip_embedded_test)

  {

    log_timestamp();

    info("Running embedded server test suite");
@@ -551,9 +551,6 @@ Delete the distribution file. 
--distribution=<distribution_file>

Name of the MySQL source distribution file.



--embedded-test

Run the test suite against the embedded server



--enable-shared

Compile with shared libraries
@@ -602,15 +599,18 @@ Compile and install the given perl modules. 
--perl-options=<options>

Build Perl modules with the additional options



--ps-test

Run an additional test run, using prepared statements



--raid

Compile with RAID support



--readline

Compile against readline library instead of libedit



--skip-embedded-test

Skip running the test suite against the embedded server



--skip-ps-test

Skip running the additional test run that uses the prepared statement protocol



--stage=[1-6]

Start script from some specific point.

config/ac-macros/character_sets.m4

+7 −7
Original line number Diff line number Diff line
@@ -7,14 +7,14 @@ AC_DIVERT_PUSH(0) 


define(CHARSETS_AVAILABLE0,binary)

define(CHARSETS_AVAILABLE1,armscii8 ascii big5 cp1250 cp1251 cp1256 cp1257)

define(CHARSETS_AVAILABLE2,cp850 cp852 cp866 cp932 dec8 eucjp_ms euckr gb2312 gbk geostd8)

define(CHARSETS_AVAILABLE2,cp850 cp852 cp866 cp932 dec8 eucjpms euckr gb2312 gbk geostd8)

define(CHARSETS_AVAILABLE3,greek hebrew hp8 keybcs2 koi8r koi8u)

define(CHARSETS_AVAILABLE4,latin1 latin2 latin5 latin7 macce macroman)

define(CHARSETS_AVAILABLE5,sjis swe7 tis620 ucs2 ujis utf8)



DEFAULT_CHARSET=latin1

CHARSETS_AVAILABLE="CHARSETS_AVAILABLE0 CHARSETS_AVAILABLE1 CHARSETS_AVAILABLE2 CHARSETS_AVAILABLE3 CHARSETS_AVAILABLE4 CHARSETS_AVAILABLE5"

CHARSETS_COMPLEX="big5 cp1250 cp932 eucjp_ms euckr gb2312 gbk latin1 latin2 sjis tis620 ucs2 ujis utf8"

CHARSETS_COMPLEX="big5 cp1250 cp932 eucjpms euckr gb2312 gbk latin1 latin2 sjis tis620 ucs2 ujis utf8"



AC_DIVERT_POP
@@ -111,8 +111,8 @@ do 
    dec8)

      AC_DEFINE(HAVE_CHARSET_dec8, 1, [Define to enable charset dec8])

      ;;

    eucjp_ms)

      AC_DEFINE(HAVE_CHARSET_eucjp_ms, 1, [Define to enable charset eucjp_ms])

    eucjpms)

      AC_DEFINE(HAVE_CHARSET_eucjpms, 1, [Define to enable charset eucjpms])

      AC_DEFINE([USE_MB], [1], [Use multi-byte character routines])

      AC_DEFINE(USE_MB_IDENT, 1)

      ;;
@@ -259,9 +259,9 @@ case $default_charset in 
      default_charset_default_collation="dec8_swedish_ci"

      default_charset_collations="dec8_swedish_ci dec8_bin"

      ;;

    eucjp_ms)

      default_charset_default_collation="eucjp_ms_japanese_ci"

      default_charset_collations="eucjp_ms_japanese_ci ujis_bin"

    eucjpms)

      default_charset_default_collation="eucjpms_japanese_ci"

      default_charset_collations="eucjpms_japanese_ci ujis_bin"

      ;;

    euckr)

      default_charset_default_collation="euckr_korean_ci"

include/m_ctype.h

+2 −2
Original line number Diff line number Diff line
@@ -232,8 +232,8 @@ extern CHARSET_INFO my_charset_big5_chinese_ci; 
extern CHARSET_INFO my_charset_big5_bin;

extern CHARSET_INFO my_charset_cp932_japanese_ci;

extern CHARSET_INFO my_charset_cp932_bin;

extern CHARSET_INFO my_charset_eucjp_ms_japanese_ci;

extern CHARSET_INFO my_charset_eucjp_ms_bin;

extern CHARSET_INFO my_charset_eucjpms_japanese_ci;

extern CHARSET_INFO my_charset_eucjpms_bin;

extern CHARSET_INFO my_charset_euckr_korean_ci;

extern CHARSET_INFO my_charset_euckr_bin;

extern CHARSET_INFO my_charset_gb2312_chinese_ci;

libmysql/Makefile.shared

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ mystringsobjects = strmov.lo strxmov.lo strxnmov.lo strnmov.lo \ 
			bchange.lo bmove.lo bmove_upp.lo longlong2str.lo \

			strtoull.lo strtoll.lo llstr.lo my_vsnprintf.lo \

			ctype.lo ctype-simple.lo ctype-bin.lo ctype-mb.lo \

			ctype-big5.lo ctype-czech.lo ctype-cp932.lo ctype-eucjp_ms.lo ctype-euc_kr.lo \

			ctype-big5.lo ctype-czech.lo ctype-cp932.lo ctype-eucjpms.lo ctype-euc_kr.lo \

			ctype-win1250ch.lo ctype-utf8.lo ctype-extra.lo \

			ctype-ucs2.lo ctype-gb2312.lo ctype-gbk.lo \

			ctype-sjis.lo ctype-tis620.lo ctype-ujis.lo \

mysql-test/r/ctype_cp932.result

+1 −1
Original line number Diff line number Diff line
@@ -8573,7 +8573,7 @@ F9F9 
F9FA

F9FB

F9FC

CREATE TABLE t4 SELECT CONVERT(c1 USING eucjp_ms) AS c1 FROM t1;

CREATE TABLE t4 SELECT CONVERT(c1 USING eucjpms) AS c1 FROM t1;

SELECT HEX(c1) FROM t4;

HEX(c1)

05