Commit 980edea1 authored by unknown's avatar unknown
Browse files

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

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-main


heap/hp_write.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
parents 97c4143e 454e889f

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ int main(int argc,char *argv[]) 
  put_info((char*) glob_buffer.ptr(),INFO_INFO);



#ifdef HAVE_READLINE

  initialize_readline(my_progname);

  initialize_readline((char*) my_progname);

  if (!status.batch && !quick && !opt_html && !opt_xml)

  {

    /* read-history from file, default ~/.mysql_history*/

client/mysqlbinlog.cc

+1 −1
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ static int dump_remote_log_entries(const char* logname) 
    }

    if (len < 8 && net->read_pos[0] == 254)

      break; // end of data

    DBUG_PRINT("info",( "len= %u, net->read_pos[5] = %d\n",

    DBUG_PRINT("info",( "len: %lu  net->read_pos[5]: %d\n",

			len, net->read_pos[5]));

    Log_event *ev = Log_event::read_log_event((const char*) net->read_pos + 1 ,

					      len - 1, &error_msg, old_format);

client/sql_string.cc

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ bool String::set(longlong num, CHARSET_INFO *cs) 
  }

  else

  {

    str_length=cs->cset->snprintf(cs,Ptr,l,"%d",num);

    str_length=cs->cset->snprintf(cs,Ptr,l,"%ld", (long) num);

  }

  str_charset=cs;

  return FALSE;
@@ -121,7 +121,7 @@ bool String::set(ulonglong num, CHARSET_INFO *cs) 
  }

  else

  {

    str_length=cs->cset->snprintf(cs,Ptr,l,"%d",num);

    str_length=cs->cset->snprintf(cs,Ptr,l,"%ld", (long) num);

  }

  str_charset=cs;

  return FALSE;

extra/perror.c

+3 −1
Original line number Diff line number Diff line
@@ -253,7 +253,9 @@ int main(int argc,char *argv[]) 
        'Unknown Error' (without regard to case).

      */

      if (msg &&

          my_strnncoll(&my_charset_latin1, msg, 13, "Unknown Error", 13) &&

          my_strnncoll(&my_charset_latin1,

                       (const uchar *) msg, 13,

                       (const uchar *) "Unknown Error", 13) &&

          (!unknown_error || strcmp(msg, unknown_error)))

      {

	found=1;

heap/_check.c

+5 −5
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ int heap_check_heap(HP_INFO *info, my_bool print_status) 


  if (records != share->records || deleted != share->deleted)

  {

    DBUG_PRINT("error",("Found rows: %lu (%lu)  deleted %lu (%lu)",

    DBUG_PRINT("error",("Found rows: %lu (%u)  deleted %lu (%u)",

			records, share->records, deleted, share->deleted));

    error= 1;

  }
@@ -123,7 +123,7 @@ static int check_one_key(HP_KEYDEF *keydef, uint keynr, ulong records, 
			        blength, records))

	    != i)

	{

	  DBUG_PRINT("error",("Record in wrong link: Link %d  Record: %lx  Record-link %d", i,hash_info->ptr_to_rec,rec_link));

	  DBUG_PRINT("error",("Record in wrong link: Link %d  Record: %lx  Record-link %d", i, (ulong) hash_info->ptr_to_rec, rec_link));

	  error=1;

	}

	else
@@ -135,12 +135,12 @@ static int check_one_key(HP_KEYDEF *keydef, uint keynr, ulong records, 
  }

  if (found != records)

  {

    DBUG_PRINT("error",("Found %ld of %ld records", found, records));

    DBUG_PRINT("error",("Found %u of %ld records", found, records));

    error=1;

  }

  if (keydef->hash_buckets != hash_buckets_found)

  {

    DBUG_PRINT("error",("Found %ld buckets, stats shows %ld buckets",

    DBUG_PRINT("error",("Found %u buckets, stats shows %ld buckets",

                        hash_buckets_found, keydef->hash_buckets));

    error=1;

  }
@@ -181,7 +181,7 @@ static int check_one_rb_key(HP_INFO *info, uint keynr, ulong records, 
      {

	error= 1;

	DBUG_PRINT("error",("Record in wrong link:  key: %d  Record: %lx\n", 

			    keynr, recpos));

			    keynr, (ulong) recpos));

      }

      else

	found++;