Commit e0b2dab7 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


sql/log.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 137136d2 29d2b6f6

client/mysqlbinlog.cc

+15 −0
Original line number Diff line number Diff line
@@ -1249,6 +1249,14 @@ int main(int argc, char** argv) 
    fprintf(result_file,

            "/*!32316 SET @OLD_SQL_LOG_BIN=@@SQL_LOG_BIN, SQL_LOG_BIN=0*/;\n");



  /*

    In mysqlbinlog|mysql, don't want mysql to be disconnected after each

    transaction (which would be the case with GLOBAL.COMPLETION_TYPE==2).

  */

  fprintf(result_file,

          "/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,"

          "COMPLETION_TYPE=0*/;\n");



  for (save_stop_position= stop_position, stop_position= ~(my_off_t)0 ;

       (--argc >= 0) && !stop_passed ; )

  {
@@ -1263,6 +1271,13 @@ int main(int argc, char** argv) 
    start_position= BIN_LOG_HEADER_SIZE;

  }



  /*

    Issue a ROLLBACK in case the last printed binlog was crashed and had half

    of transaction.

  */

  fprintf(result_file,

          "ROLLBACK;\n"

          "/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;\n");

  if (disable_log_bin)

    fprintf(result_file, "/*!32316 SET SQL_LOG_BIN=@OLD_SQL_LOG_BIN*/;\n");

include/config-win.h

+1 −0
Original line number Diff line number Diff line
@@ -408,4 +408,5 @@ inline double ulonglong2double(ulonglong value) 
#define HAVE_CHARSET_ucs2 1

#define HAVE_CHARSET_ujis 1

#define HAVE_CHARSET_utf8 1

#define HAVE_UCA_COLLATIONS 1

include/mysys_err.h

+2 −1
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ extern const char * NEAR globerrs[]; /* my_error_messages is here */ 
#define EE_CANT_SYMLINK		25

#define EE_REALPATH		26

#define EE_SYNC			27

#define EE_ERROR_LAST           27 /*Copy last error nr.*/

#define EE_UNKNOWN_COLLATION	28

#define EE_ERROR_LAST           28 /*Copy last error nr.*/

/* Add error numbers before EE_ERROR_LAST and change it accordingly. */



  /* exit codes for all MySQL programs */

myisam/myisamchk.c

+13 −11
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ SET_STACK_SIZE(9000) /* Minimum stack size for program */ 
static uint decode_bits;

static char **default_argv;

static const char *load_default_groups[]= { "myisamchk", 0 };

static const char *set_charset_name, *opt_tmpdir;

static CHARSET_INFO *set_charset;

static const char *set_collation_name, *opt_tmpdir;

static CHARSET_INFO *set_collation;

static long opt_myisam_block_size;

static long opt_key_cache_block_size;

static const char *my_progname_short;
@@ -149,7 +149,7 @@ int main(int argc, char **argv) 
} /* main */



enum options_mc {

  OPT_CHARSETS_DIR=256, OPT_SET_CHARSET,OPT_START_CHECK_POS,

  OPT_CHARSETS_DIR=256, OPT_SET_COLLATION,OPT_START_CHECK_POS,

  OPT_CORRECT_CHECKSUM, OPT_KEY_BUFFER_SIZE,

  OPT_KEY_CACHE_BLOCK_SIZE, OPT_MYISAM_BLOCK_SIZE,

  OPT_READ_BUFFER_SIZE, OPT_WRITE_BUFFER_SIZE, OPT_SORT_BUFFER_SIZE,
@@ -252,9 +252,9 @@ static struct my_option my_long_options[] = 
   (gptr*) &check_param.auto_increment_value,

   (gptr*) &check_param.auto_increment_value,

   0, GET_ULL, OPT_ARG, 0, 0, 0, 0, 0, 0},

  {"set-character-set", OPT_SET_CHARSET,

   "Change the character set used by the index",

   (gptr*) &set_charset_name, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"set-collation", OPT_SET_COLLATION,

   "Change the collation used by the index",

   (gptr*) &set_collation_name, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"set-variable", 'O',

   "Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value.",

   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -739,8 +739,9 @@ static void get_options(register int *argc,register char ***argv) 
  check_param.tmpdir=&myisamchk_tmpdir;

  check_param.key_cache_block_size= opt_key_cache_block_size;



  if (set_charset_name)

    if (!(set_charset=get_charset_by_name(set_charset_name, MYF(MY_WME))))

  if (set_collation_name)

    if (!(set_collation= get_charset_by_name(set_collation_name,

                                             MYF(MY_WME))))

      exit(1);



  myisam_block_size=(uint) 1 << my_bit_log2(opt_myisam_block_size);
@@ -874,11 +875,12 @@ static int myisamchk(MI_CHECK *param, my_string filename) 
	(((ulonglong) 1L << share->base.keys)-1)) ||

       test_if_almost_full(info) ||

       info->s->state.header.file_version[3] != myisam_file_magic[3] ||

       (set_charset && set_charset->number != share->state.header.language) ||

       (set_collation &&

        set_collation->number != share->state.header.language) ||

       myisam_block_size != MI_KEY_BLOCK_LENGTH))

  {

    if (set_charset)

      param->language=set_charset->number;

    if (set_collation)

      param->language= set_collation->number;

    if (recreate_table(param, &info,filename))

    {

      VOID(fprintf(stderr,

mysql-test/r/count_distinct2.result

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ count(distinct n) 
5000

show status like 'Created_tmp_disk_tables';

Variable_name	Value

Created_tmp_disk_tables	2

Created_tmp_disk_tables	1

drop table t1;

create table t1 (s text);

flush status;
@@ -125,5 +125,5 @@ count(distinct s) 
5000

show status like 'Created_tmp_disk_tables';

Variable_name	Value

Created_tmp_disk_tables	2

Created_tmp_disk_tables	1

drop table t1;