Commit 1ad9ba57 authored by unknown's avatar unknown
Browse files

Merge

parents 90b240e7 4a115d65

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -1819,7 +1819,7 @@ AC_CHECK_FUNCS(alarm bcmp bfill bmove bzero chsize cuserid fchmod fcntl \ 
  getcwd gethostbyaddr_r gethostbyname_r getpass getpassphrase getpwnam \

  getpwuid getrlimit getrusage getwd gmtime_r index initgroups isnan \

  localtime_r locking longjmp lrand48 madvise mallinfo memcpy memmove \

  mkstemp mlockall perror poll pread pthread_attr_create mmap getpagesize \

  mkstemp mlockall perror poll pread pthread_attr_create mmap mmap64 getpagesize \

  pthread_attr_getstacksize pthread_attr_setprio pthread_attr_setschedparam \

  pthread_attr_setstacksize pthread_condattr_create pthread_getsequence_np \

  pthread_key_delete pthread_rwlock_rdlock pthread_setprio \

include/my_base.h

+2 −1
Original line number Diff line number Diff line
@@ -152,7 +152,8 @@ enum ha_extra_function { 
    other fields intact. When this is off (by default) InnoDB will use memcpy

    to overwrite entire row.

  */

  HA_EXTRA_KEYREAD_PRESERVE_FIELDS

  HA_EXTRA_KEYREAD_PRESERVE_FIELDS,

  HA_EXTRA_MMAP

};



	/* The following is parameter to ha_panic() */

include/my_sys.h

+4 −0
Original line number Diff line number Diff line
@@ -821,7 +821,11 @@ my_bool my_gethwaddr(uchar *to); 
#define MAP_NOSYNC      0

#endif



#ifdef HAVE_MMAP64

#define my_mmap(a,b,c,d,e,f)    mmap64(a,b,c,d,e,f)

#else

#define my_mmap(a,b,c,d,e,f)    mmap(a,b,c,d,e,f)

#endif

#ifdef HAVE_GETPAGESIZE

#define my_getpagesize()        getpagesize()

#else

sql/ha_myisam.cc

+4 −0
Original line number Diff line number Diff line
@@ -304,6 +304,10 @@ int ha_myisam::open(const char *name, int mode, uint test_if_locked) 
  

  if (test_if_locked & (HA_OPEN_IGNORE_IF_LOCKED | HA_OPEN_TMP_TABLE))

    VOID(mi_extra(file, HA_EXTRA_NO_WAIT_LOCK, 0));



  if (!(test_if_locked & HA_OPEN_TMP_TABLE) && opt_myisam_use_mmap)

    VOID(mi_extra(file, HA_EXTRA_MMAP, 0));



  info(HA_STATUS_NO_LOCK | HA_STATUS_VARIABLE | HA_STATUS_CONST);

  if (!(test_if_locked & HA_OPEN_WAIT_IF_LOCKED))

    VOID(mi_extra(file, HA_EXTRA_WAIT_LOCK, 0));

sql/mysql_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -1215,7 +1215,7 @@ extern bool volatile abort_loop, shutdown_in_progress, grant_option; 
extern bool mysql_proc_table_exists;

extern uint volatile thread_count, thread_running, global_read_lock;

extern my_bool opt_sql_bin_update, opt_safe_user_create, opt_no_mix_types;

extern my_bool opt_safe_show_db, opt_local_infile;

extern my_bool opt_safe_show_db, opt_local_infile, opt_myisam_use_mmap;

extern my_bool opt_slave_compressed_protocol, use_temp_pool;

extern my_bool opt_readonly, lower_case_file_system;

extern my_bool opt_enable_named_pipe, opt_sync_frm, opt_allow_suspicious_udfs;