Commit 597b307d authored by unknown's avatar unknown
Browse files

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

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
parents d0760667 4d29b85d

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -859,6 +859,7 @@ ndb/test/ndbapi/testNodeRestart 
ndb/test/ndbapi/testOIBasic

ndb/test/ndbapi/testOperations

ndb/test/ndbapi/testRestartGci

ndb/test/ndbapi/testSRBank

ndb/test/ndbapi/testScan

ndb/test/ndbapi/testScan.dsp

ndb/test/ndbapi/testScanInterpreter

client/mysqltest.c

+2 −1
Original line number Diff line number Diff line
@@ -2382,7 +2382,8 @@ int read_line(char *buf, int size) 
    if (feof(cur_file->file))

    {

  found_eof:

      if (cur_file->file != stdin){

      if (cur_file->file != stdin)

      {

	my_fclose(cur_file->file, MYF(0));

        cur_file->file= 0;

      }

config/ac-macros/character_sets.m4

+2 −2
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ case $default_charset in 
      default_charset_default_collation="ucs2_general_ci"

      define(UCSC1, ucs2_general_ci ucs2_bin)

      define(UCSC2, ucs2_czech_ci ucs2_danish_ci)

      define(UCSC3, ucs2_estonian_ci ucs2_icelandic_ci)

      define(UCSC3, ucs2_esperanto_ci ucs2_estonian_ci ucs2_icelandic_ci)

      define(UCSC4, ucs2_latvian_ci ucs2_lithuanian_ci)

      define(UCSC5, ucs2_persian_ci ucs2_polish_ci ucs2_romanian_ci)

      define(UCSC6, ucs2_slovak_ci ucs2_slovenian_ci)
@@ -367,7 +367,7 @@ case $default_charset in 
      else

        define(UTFC1, utf8_general_ci utf8_bin)

        define(UTFC2, utf8_czech_ci utf8_danish_ci)

        define(UTFC3, utf8_estonian_ci utf8_icelandic_ci)

        define(UTFC3, utf8_esperanto_ci utf8_estonian_ci utf8_icelandic_ci)

        define(UTFC4, utf8_latvian_ci utf8_lithuanian_ci)

        define(UTFC5, utf8_persian_ci utf8_polish_ci utf8_romanian_ci)

        define(UTFC6, utf8_slovak_ci utf8_slovenian_ci)

heap/hp_hash.c

+6 −4
Original line number Diff line number Diff line
@@ -551,11 +551,13 @@ int hp_rec_key_cmp(HP_KEYDEF *keydef, const byte *rec1, const byte *rec2, 
      }

      if (cs->mbmaxlen > 1)

      {

        uint safe_length1= char_length1;

        uint safe_length2= char_length2;

        uint char_length= seg->length / cs->mbmaxlen;

        char_length1= my_charpos(cs, pos1, pos1 + char_length1, char_length1);

        set_if_smaller(char_length1, seg->length);

        char_length2= my_charpos(cs, pos2, pos2 + char_length2, char_length2);

        set_if_smaller(char_length2, seg->length);

        char_length1= my_charpos(cs, pos1, pos1 + char_length1, char_length);

        set_if_smaller(char_length1, safe_length1);

        char_length2= my_charpos(cs, pos2, pos2 + char_length2, char_length);

        set_if_smaller(char_length2, safe_length2);

      }



      if (cs->coll->strnncollsp(seg->charset,

mysql-test/mysql-test-run.pl

+6 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ our $exe_mysql_fix_system_tables; 
our $exe_mysqltest;

our $exe_slave_mysqld;

our $exe_im;

our $exe_my_print_defaults;



our $opt_bench= 0;

our $opt_small_bench= 0;
@@ -872,6 +873,8 @@ sub executable_setup () { 
    $exe_mysql=          mtr_exe_exists("$path_client_bindir/mysql");

    $exe_mysql_fix_system_tables=

      mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables");

    $exe_my_print_defaults=

      mtr_script_exists("$glob_basedir/extra/my_print_defaults");

    $path_ndb_tools_dir= mtr_path_exists("$glob_basedir/ndb/tools");

    $exe_ndb_mgm=        "$glob_basedir/ndb/src/mgmclient/ndb_mgm";

  }
@@ -887,6 +890,8 @@ sub executable_setup () { 
    $exe_mysql_fix_system_tables=

      mtr_script_exists("$path_client_bindir/mysql_fix_privilege_tables",

			"$glob_basedir/scripts/mysql_fix_privilege_tables");

    $exe_my_print_defaults=

      mtr_script_exists("path_client_bindir/my_print_defaults");



    $path_language=      mtr_path_exists("$glob_basedir/share/mysql/english/",

                                         "$glob_basedir/share/english/");
@@ -2384,6 +2389,7 @@ sub run_mysqltest ($) { 
  $ENV{'MYSQL_FIX_SYSTEM_TABLES'}=  $cmdline_mysql_fix_system_tables;

  $ENV{'MYSQL_CLIENT_TEST'}=        $cmdline_mysql_client_test;

  $ENV{'CHARSETSDIR'}=              $path_charsetsdir;

  $ENV{'MYSQL_MY_PRINT_DEFAULTS'}=  $exe_my_print_defaults;



  $ENV{'NDB_STATUS_OK'}=            $flag_ndb_status_ok;

  $ENV{'NDB_MGM'}=                  $exe_ndb_mgm;