Commit 00aaa9a3 authored by unknown's avatar unknown
Browse files

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

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel


BitKeeper/deleted/.del-_dynrec.c~48dd758f5a5450df:
  Auto merged
BitKeeper/deleted/.del-_page.c~148b1a613d052ee8:
  Auto merged
BitKeeper/deleted/.del-_search.c~f509292aa1ff18ff:
  Auto merged
BitKeeper/deleted/.del-close.c~fd62629496ee5bcc:
  Auto merged
BitKeeper/deleted/.del-delete.c~65ee8daaa75a14b6:
  Auto merged
BitKeeper/deleted/.del-my_tempnam.c~a8562f15dad3012f:
  Auto merged
BitKeeper/deleted/.del-open.c~95b3b75042fae00a:
  Auto merged
BitKeeper/deleted/.del-rkey.c~cc54c6498352f999:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
include/raid.h:
  Auto merged
myisam/mi_close.c:
  Auto merged
BitKeeper/deleted/.del-sort.c~e2e56b5a37ce86f4:
  Auto merged
BitKeeper/deleted/.del-write.c~8f1918b1f6770e54:
  Auto merged
myisam/mi_page.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysys/default.c:
  Auto merged
mysys/mf_keycaches.c:
  Auto merged
mysys/my_dup.c:
  Auto merged
mysys/my_fopen.c:
  Auto merged
mysys/my_handler.c:
  Auto merged
mysys/my_malloc.c:
  Auto merged
mysys/my_static.c:
  Auto merged
mysys/my_write.c:
  Auto merged
mysys/safemalloc.c:
  Auto merged
mysys/tree.c:
  Auto merged
mysys/typelib.c:
  Auto merged
regex/regexec.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
BitKeeper/deleted/.del-compiler_warnings.supp:
  Delete: support-files/compiler_warnings.supp
client/mysqlbinlog.cc:
  Manual merge from 4.1.
client/sql_string.cc:
  Manual merge from 4.1.
extra/perror.c:
  Manual merge from 4.1.
heap/_check.c:
  Manual merge from 4.1.
heap/hp_delete.c:
  Manual merge from 4.1.
heap/hp_hash.c:
  Manual merge from 4.1.
heap/hp_open.c:
  Manual merge from 4.1.
heap/hp_rkey.c:
  Manual merge from 4.1.
heap/hp_rrnd.c:
  Manual merge from 4.1.
heap/hp_write.c:
  Manual merge from 4.1.
libmysql/libmysql.c:
  Manual merge from 4.1.
libmysqld/libmysqld.c:
  Manual merge from 4.1.
myisam/mi_delete.c:
  Manual merge from 4.1.
myisam/mi_dynrec.c:
  Manual merge from 4.1.
myisam/mi_keycache.c:
  Manual merge from 4.1.
myisam/mi_statrec.c:
  Manual merge from 4.1.
myisammrg/myrg_extra.c:
  Manual merge from 4.1.
mysys/hash.c:
  Manual merge from 4.1.
mysys/list.c:
  Manual merge from 4.1.
mysys/mf_iocache.c:
  Manual merge from 4.1.
mysys/mf_keycache.c:
  Manual merge from 4.1.
mysys/my_alloc.c:
  Manual merge from 4.1.
mysys/my_fstream.c:
  Manual merge from 4.1.
mysys/my_getwd.c:
  Manual merge from 4.1.
mysys/my_lib.c:
  Manual merge from 4.1.
mysys/my_lread.c:
  Manual merge from 4.1.
mysys/my_lwrite.c:
  Manual merge from 4.1.
mysys/my_pread.c:
  Manual merge from 4.1.
mysys/my_read.c:
  Manual merge from 4.1.
mysys/my_realloc.c:
  Manual merge from 4.1.
mysys/my_seek.c:
  Manual merge from 4.1.
mysys/raid.cc:
  Manual merge from 4.1.
mysys/thr_lock.c:
  Manual merge from 4.1.
ndb/src/mgmclient/CommandInterpreter.cpp:
  Manual merge from 4.1.
sql/ha_archive.cc:
  Manual merge from 4.1.
sql/ha_innodb.cc:
  Manual merge from 4.1.
sql/ha_ndbcluster.cc:
  Manual merge from 4.1.
sql/item_subselect.cc:
  Manual merge from 4.1.
sql/log.cc:
  Manual merge from 4.1.
sql/log_event.cc:
  Manual merge from 4.1.
sql/mysqld.cc:
  Manual merge from 4.1.
sql/net_serv.cc:
  Manual merge from 4.1.
sql/slave.cc:
  Manual merge from 4.1.
sql/sql_cache.cc:
  Manual merge from 4.1.
sql/sql_class.cc:
  Manual merge from 4.1.
sql/sql_delete.cc:
  Manual merge from 4.1.
sql/sql_parse.cc:
  Manual merge from 4.1.
sql/sql_prepare.cc:
  Manual merge from 4.1.
sql-common/client.c:
  Manual merge from 4.1.
sql/sql_select.cc:
  Manual merge from 4.1.
sql/sql_table.cc:
  Manual merge from 4.1.
sql/sql_update.cc:
  Manual merge from 4.1.
sql/strfunc.cc:
  Manual merge from 4.1.
sql/table.cc:
  Manual merge from 4.1.
sql/tztime.cc:
  Manual merge from 4.1.
sql/unireg.cc:
  Manual merge from 4.1.
tests/mysql_client_test.c:
  Manual merge from 4.1.
parents 6a594ffd 454e889f

client/mysqlbinlog.cc

+1 −1
Original line number Diff line number Diff line
@@ -1105,7 +1105,7 @@ could be out of memory"); 
    }

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

      break; // end of data

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

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

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

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

                                        len - 1, &error_msg,

include/raid.h

+2 −2
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ class RaidFd { 
    inline void Calculate()

    {

      DBUG_ENTER("RaidFd::_Calculate");

      DBUG_PRINT("info",("_position: %lu _raid_chunksize: %d, _size: %lu",

      DBUG_PRINT("info",("_position: %lu  _raid_chunksize: %lu  _size: %lu",

			 (ulong) _position, _raid_chunksize, (ulong) _size));



      _total_block = (ulong) (_position / _raid_chunksize);
@@ -148,7 +148,7 @@ class RaidFd { 
      _remaining_bytes = (uint) (_raid_chunksize -

				 (_position - _total_block * _raid_chunksize));

      DBUG_PRINT("info",

		 ("_total_block: %d  this_block: %d  _remaining_bytes:%d",

		 ("_total_block: %lu  this_block: %d  _remaining_bytes: %d",

		  _total_block, _this_block, _remaining_bytes));

      DBUG_VOID_RETURN;

    }

mysys/my_handler.c

+0 −1
Original line number Diff line number Diff line
@@ -557,4 +557,3 @@ HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, uchar *a) 
  }

  return keyseg;

}

mysys/my_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ MY_STAT *my_stat(const char *path, MY_STAT *stat_area, myf my_flags) 
{

  int m_used;

  DBUG_ENTER("my_stat");

  DBUG_PRINT("my", ("path: '%s', stat_area: 0x%lx, MyFlags: %d", path,

  DBUG_PRINT("my", ("path: '%s'  stat_area: 0x%lx  MyFlags: %d", path,

                    (long) stat_area, my_flags));



  if ((m_used= (stat_area == NULL)))

mysys/my_seek.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ my_off_t my_seek(File fd, my_off_t pos, int whence, 
  if (newpos == (os_off_t) -1)

  {

    my_errno=errno;

    DBUG_PRINT("error",("lseek: %lu, errno: %d", (ulong) newpos,errno));

    DBUG_PRINT("error",("lseek: %lu  errno: %d", (ulong) newpos,errno));

    DBUG_RETURN(MY_FILEPOS_ERROR);

  }

  if ((my_off_t) newpos != pos)