Commit 75b140b9 authored by unknown's avatar unknown
Browse files

Merge build.mysql.com:/users/tulin/mysql-5.0 

into build.mysql.com:/users/tulin/mysql-5.0-ndb


libmysql_r/Makefile.am:
  Auto merged
mysql-test/r/analyse.result:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
parents c992cc49 ca1ac0c5

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;

innobase/include/sync0sync.h

+2 −0
Original line number Diff line number Diff line
@@ -415,6 +415,8 @@ or row lock! */ 
/*------------------------------------- Insert buffer tree */

#define	SYNC_IBUF_BITMAP_MUTEX	351

#define	SYNC_IBUF_BITMAP	350

/*------------------------------------- MySQL query cache mutex */

/*------------------------------------- MySQL binlog mutex */

/*-------------------------------*/

#define	SYNC_KERNEL		300

#define SYNC_REC_LOCK		299

innobase/row/row0ins.c

+4 −1
Original line number Diff line number Diff line
@@ -723,7 +723,10 @@ row_ins_foreign_check_on_constraint( 
	trx = thr_get_trx(thr);



	/* Since we are going to delete or update a row, we have to invalidate

	the MySQL query cache for table */

	the MySQL query cache for table. A deadlock of threads is not possible

	here because the caller of this function does not hold any latches with

	the sync0sync.h rank above the kernel mutex. The query cache mutex has

	a rank just above the kernel mutex. */



	row_ins_invalidate_query_cache(thr, table->name);