Commit 936a6905 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/t/mysqldump.test:
  Auto merged
parents 01db6cc2 d04eb651

client/mysqlbinlog.cc

+1 −1
Original line number Diff line number Diff line
@@ -1434,7 +1434,7 @@ int main(int argc, char** argv) 
    of transaction.

  */

  fprintf(result_file,

          "# End of log file\nROLLBACK;\n"

          "# End of log file\nROLLBACK /* added by mysqlbinlog */;\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");

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.0.14-rc)

AM_INIT_AUTOMAKE(mysql, 5.0.15-rc)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -18,7 +18,7 @@ SHARED_LIB_VERSION=15:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=14

NDB_VERSION_BUILD=15

NDB_VERSION_STATUS="rc"



# Set all version vars based on $VERSION. How do we do this more elegant ?

myisam/mi_check.c

+5 −5
Original line number Diff line number Diff line
@@ -1092,7 +1092,7 @@ int chk_data_link(MI_CHECK *param, MI_INFO *info,int extend) 
			 "Keypointers and record positions doesn't match");

    error=1;

  }

  else if (param->glob_crc != info->s->state.checksum &&

  else if (param->glob_crc != info->state->checksum &&

	   (info->s->options &

	    (HA_OPTION_CHECKSUM | HA_OPTION_COMPRESS_RECORD)))

  {
@@ -1388,7 +1388,7 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info, 
    info->state->data_file_length=sort_param.max_pos;

  }

  if (param->testflag & T_CALC_CHECKSUM)

    share->state.checksum=param->glob_crc;

    info->state->checksum=param->glob_crc;



  if (!(param->testflag & T_SILENT))

  {
@@ -2156,7 +2156,7 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info, 
			       my_errno);

  }

  if (param->testflag & T_CALC_CHECKSUM)

    share->state.checksum=param->glob_crc;

    info->state->checksum=param->glob_crc;



  if (my_chsize(share->kfile,info->state->key_file_length,0,MYF(0)))

    mi_check_print_warning(param,
@@ -2577,7 +2577,7 @@ int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info, 
			       my_errno);

  }

  if (param->testflag & T_CALC_CHECKSUM)

    share->state.checksum=param->glob_crc;

    info->state->checksum=param->glob_crc;



  if (my_chsize(share->kfile,info->state->key_file_length,0,MYF(0)))

    mi_check_print_warning(param,
@@ -3808,7 +3808,7 @@ int recreate_table(MI_CHECK *param, MI_INFO **org_info, char *filename) 
    (*org_info)->s->state.create_time=share.state.create_time;

  (*org_info)->s->state.unique=(*org_info)->this_unique=

    share.state.unique;

  (*org_info)->s->state.checksum=share.state.checksum;

  (*org_info)->state->checksum=info.state->checksum;

  (*org_info)->state->del=info.state->del;

  (*org_info)->s->state.dellink=share.state.dellink;

  (*org_info)->state->empty=info.state->empty;

myisam/mi_delete.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ int mi_delete(MI_INFO *info,const byte *record) 


  if ((*share->delete_record)(info))

    goto err;				/* Remove record from database */

  info->s->state.checksum-=info->checksum;

  info->state->checksum-=info->checksum;



  info->update= HA_STATE_CHANGED+HA_STATE_DELETED+HA_STATE_ROW_CHANGED;

  info->state->records--;

myisam/mi_delete_all.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ int mi_delete_all_rows(MI_INFO *info) 
  info->state->key_file_length=share->base.keystart;

  info->state->data_file_length=0;

  info->state->empty=info->state->key_empty=0;

  state->checksum=0;

  info->state->checksum=0;



  for (i=share->base.max_key_block_length/MI_MIN_KEY_BLOCK_LENGTH ; i-- ; )

    state->key_del[i]= HA_OFFSET_ERROR;