Commit b2f86715 authored by tnurnberg@mysql.com/white.intern.koehntopp.de's avatar tnurnberg@mysql.com/white.intern.koehntopp.de
Browse files

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 

into  mysql.com:/misc/mysql/31752_/41-31752_
parents 4e50bb0e dddced96

mysys/mf_pack.c

+2 −2
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ void symdirget(char *dir) 


  SYNOPSIS

    unpack_dirname()

    to			Store result here.  May be = from

    to			result-buffer, FN_REFLEN characters. may be == from

    from		'Packed' directory name (may contain ~)



 IMPLEMENTATION
@@ -398,7 +398,7 @@ uint unpack_filename(my_string to, const char *from) 


	/* Convert filename (unix standard) to system standard */

	/* Used before system command's like open(), create() .. */

	/* Returns length of to */

	/* Returns used length of to; total length should be FN_REFLEN */



uint system_filename(my_string to, const char *from)

{

sql/log.cc

+2 −2
Original line number Diff line number Diff line
@@ -963,10 +963,10 @@ int MYSQL_LOG::purge_logs_before_date(time_t purge_time) 
void MYSQL_LOG::make_log_name(char* buf, const char* log_ident)

{

  uint dir_len = dirname_length(log_file_name); 

  if (dir_len > FN_REFLEN)

  if (dir_len >= FN_REFLEN)

    dir_len=FN_REFLEN-1;

  strnmov(buf, log_file_name, dir_len);

  strmake(buf+dir_len, log_ident, FN_REFLEN - dir_len);

  strmake(buf+dir_len, log_ident, FN_REFLEN - dir_len -1);

}

sql/repl_failsafe.cc

+1 −1
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ int load_master_data(THD* thd) 
			     0, (SLAVE_IO | SLAVE_SQL)))

          send_error(thd, ER_MASTER_INFO);

	strmake(active_mi->master_log_name, row[0],

		sizeof(active_mi->master_log_name));

		sizeof(active_mi->master_log_name) -1);

	active_mi->master_log_pos= my_strtoll10(row[1], (char**) 0, &error);

        /* at least in recent versions, the condition below should be false */

	if (active_mi->master_log_pos < BIN_LOG_HEADER_SIZE)

sql/sql_show.cc

+3 −2
Original line number Diff line number Diff line
@@ -136,7 +136,8 @@ int mysqld_show_tables(THD *thd,const char *db,const char *wild) 
{

  Item_string *field=new Item_string("",0,thd->charset());

  List<Item> field_list;

  char path[FN_LEN],*end;

  char path[FN_REFLEN],*end;                    // for unpack_dirname()



  List<char> files;

  char *file_name;

  Protocol *protocol= thd->protocol;
@@ -457,7 +458,7 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild) 
  Item *item;

  List<char> files;

  List<Item> field_list;

  char path[FN_LEN];

  char path[FN_REFLEN];                         // for unpack_dirname()

  char *file_name;

  TABLE *table;

  Protocol *protocol= thd->protocol;

sql/unireg.cc

+8 −0
Original line number Diff line number Diff line
@@ -140,6 +140,14 @@ bool mysql_create_frm(THD *thd, my_string file_name, 
  strmake((char*) forminfo+47,create_info->comment ? create_info->comment : "",

	  60);

  forminfo[46]=(uchar) strlen((char*)forminfo+47);	// Length of comment

#ifdef EXTRA_DEBUG

  /*

    EXTRA_DEBUG causes strmake() to initialize its buffer behind the

    payload with a magic value to detect wrong buffer-sizes. We

    explicitly zero that segment again.

  */

  memset((char*) forminfo+47 + forminfo[46], 0, 61 - forminfo[46]);

#endif



  if (my_pwrite(file,(byte*) fileinfo,64,0L,MYF_RW) ||

      my_pwrite(file,(byte*) keybuff,key_info_length,