Commit 1d846098 authored by tnurnberg@white.intern.koehntopp.de's avatar tnurnberg@white.intern.koehntopp.de
Browse files

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

into  mysql.com:/misc/mysql/32770/50-32770
parents 2ab88382 f7aa7192

client/mysql.cc

+4 −1
Original line number Diff line number Diff line
@@ -3085,7 +3085,10 @@ com_connect(String *buffer, char *line) 
      Two null bytes are needed in the end of buff to allow

      get_arg to find end of string the second time it's called.

    */

    strmake(buff, line, sizeof(buff)-2);

    tmp= strmake(buff, line, sizeof(buff)-2);

#ifdef EXTRA_DEBUG

    tmp[1]= 0;

#endif

    tmp= get_arg(buff, 0);

    if (tmp && *tmp)

    {

mysys/mf_pack.c

+2 −2
Original line number Diff line number Diff line
@@ -271,7 +271,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
@@ -397,7 +397,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
@@ -1284,10 +1284,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
@@ -922,7 +922,7 @@ bool load_master_data(THD* thd) 
			     0, (SLAVE_IO | SLAVE_SQL)))

          my_message(ER_MASTER_INFO, ER(ER_MASTER_INFO), MYF(0));

	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_2);

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

	if (active_mi->master_log_pos < BIN_LOG_HEADER_SIZE)

sql/sp.cc

+1 −1
Original line number Diff line number Diff line
@@ -1895,7 +1895,7 @@ sp_use_new_db(THD *thd, LEX_STRING new_db, LEX_STRING *old_db, 


  if (thd->db)

  {

    old_db->length= (strmake(old_db->str, thd->db, old_db->length) -

    old_db->length= (strmake(old_db->str, thd->db, old_db->length - 1) -

                     old_db->str);

  }

  else