Commit dcdbfa65 authored by unknown's avatar unknown
Browse files

merge 


BitKeeper/etc/logging_ok:
  auto-union
include/mysql_com.h:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents e0b2dab7 885e13ab

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ bar@gw.udmsearch.izhnet.ru 
bar@mysql.com

bar@noter.intranet.mysql.r18.ru

bell@51.0.168.192.in-addr.arpa

bell@52.0.168.192.in-addr.arpa

bell@laptop.sanja.is.com.ua

bell@sanja.is.com.ua

bk@admin.bk
@@ -207,6 +208,7 @@ ramil@mysql.com 
ranger@regul.home.lan

rburnett@build.mysql.com

reggie@bob.(none)

reggie@mdk10.(none)

root@home.(none)

root@mc04.(none)

root@x3.internalnet

VC++Files/mysys/mysys.dsp

+4 −0
Original line number Diff line number Diff line
@@ -448,6 +448,10 @@ SOURCE=.\my_mkdir.c 
# End Source File

# Begin Source File



SOURCE=.\my_mmap.c

# End Source File

# Begin Source File



SOURCE=.\my_net.c

# End Source File

# Begin Source File

include/mysql_com.h

+5 −0
Original line number Diff line number Diff line
@@ -187,6 +187,11 @@ typedef struct st_net { 
  char save_char;

  my_bool no_send_ok;  /* For SPs and other things that do multiple stmts */

  my_bool no_send_eof; /* For SPs' first version read-only cursors */

  /*

    Set if OK packet is already sent, and we do not need to send error

    messages

  */

  my_bool no_send_error;

  /*

    Pointer to query object in query cache, do not equal NULL (0) for

    queries in cache that have not stored its results yet

myisam/mi_extra.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



#include "myisamdef.h"

#ifdef HAVE_MMAP

#ifdef HAVE_SYS_MMAN_H

#include <sys/mman.h>

#endif

myisam/mi_packrec.c

+5 −4
Original line number Diff line number Diff line
@@ -1181,11 +1181,12 @@ static uint max_bit(register uint value) 
/*****************************************************************************

	Some redefined functions to handle files when we are using memmap

*****************************************************************************/

#ifdef HAVE_SYS_MMAN_H

#include <sys/mman.h>

#endif



#ifdef HAVE_MMAP



#include <sys/mman.h>



static int _mi_read_mempack_record(MI_INFO *info,my_off_t filepos,byte *buf);

static int _mi_read_rnd_mempack_record(MI_INFO*, byte *,my_off_t, my_bool);
@@ -1211,7 +1212,7 @@ my_bool _mi_memmap_file(MI_INFO *info) 
      DBUG_RETURN(0);

    }

    file_map=(byte*)

      mmap(0,share->state.state.data_file_length+MEMMAP_EXTRA_MARGIN,PROT_READ,

      my_mmap(0,share->state.state.data_file_length+MEMMAP_EXTRA_MARGIN,PROT_READ,

	   MAP_SHARED | MAP_NORESERVE,info->dfile,0L);

    if (file_map == (byte*) MAP_FAILED)

    {
@@ -1230,7 +1231,7 @@ my_bool _mi_memmap_file(MI_INFO *info) 


void _mi_unmap_file(MI_INFO *info)

{

  VOID(munmap((caddr_t) info->s->file_map,

  VOID(my_munmap(info->s->file_map,

	      (size_t) info->s->state.state.data_file_length+

	      MEMMAP_EXTRA_MARGIN));

}