Commit d1c80dd6 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-clean 

into  mysql.com:/home/jimw/my/mysql-5.0-clean


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
myisam/mi_extra.c:
  Auto merged
mysql-test/r/lowercase_table.result:
  Auto merged
mysql-test/t/lowercase_table.test:
  Auto merged
mysys/my_access.c:
  Auto merged
BitKeeper/deleted/.del-extra.c~706f29d72beb2565:
  Auto merged
sql/examples/ha_tina.cc:
  Resolve conflict
parents bdddd8c0 1b6fdf86

configure.in

+7 −0
Original line number Diff line number Diff line
@@ -1957,6 +1957,13 @@ AC_CACHE_CHECK([style of gethost* routines], mysql_cv_gethost_style, 
AC_LANG_SAVE

AC_LANG_CPLUSPLUS



# Test whether madvise() is declared in C++ code -- it is not on some

# systems, such as Solaris

AC_CHECK_DECLS(madvise, [], [], [#if HAVE_SYS_MMAN_H

#include <sys/types.h>

#include <sys/mman.h>

#endif])



# Do not treat warnings as errors if we are linking against other libc

# this is to work around gcc not being permissive on non-system includes

# with respect to ANSI C++

include/my_global.h

+4 −0
Original line number Diff line number Diff line
@@ -331,6 +331,10 @@ C_MODE_END 
#undef setrlimit

#define setrlimit cma_setrlimit64

#endif

/* Declare madvise where it is not declared for C++, like Solaris */

#if HAVE_MADVISE && !HAVE_DECL_MADVISE && defined(__cplusplus)

extern "C" int madvise(void *addr, size_t len, int behav);

#endif



#ifdef __QNXNTO__

/* This has to be after include limits.h */

myisam/mi_extra.c

+3 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg) 
    }

    if (share->base.blobs)

      mi_alloc_rec_buff(info, -1, &info->rec_buff);

#if defined(HAVE_MMAP) && defined(HAVE_MADVICE)

#if defined(HAVE_MMAP) && defined(HAVE_MADVISE)

    if (info->opt_flag & MEMMAP_USED)

      madvise(share->file_map,share->state.state.data_file_length,MADV_RANDOM);

#endif
@@ -93,7 +93,7 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg) 
      my_errno=EACCES;

      break;

    }

#if defined(HAVE_MMAP) && defined(HAVE_MADVICE)

#if defined(HAVE_MMAP) && defined(HAVE_MADVISE)

    if ((share->options & HA_OPTION_COMPRESS_RECORD))

    {

      pthread_mutex_lock(&share->intern_lock);
@@ -177,7 +177,7 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg) 
      error=end_io_cache(&info->rec_cache);

      /* Sergei will insert full text index caching here */

    }

#if defined(HAVE_MMAP) && defined(HAVE_MADVICE)

#if defined(HAVE_MMAP) && defined(HAVE_MADVISE)

    if (info->opt_flag & MEMMAP_USED)

      madvise(share->file_map,share->state.state.data_file_length,MADV_RANDOM);

#endif

mysql-test/include/windows.inc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
--require r/true.require

disable_query_log;

select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") as "TRUE";

enable_query_log;

mysql-test/r/lowercase_table.result

+0 −6
Original line number Diff line number Diff line
@@ -84,9 +84,3 @@ create table t2 like T1; 
drop table t1, t2;

show tables;

Tables_in_test
 
use lpt1;

ERROR 42000: Unknown database 'lpt1'

use com1;

ERROR 42000: Unknown database 'com1'

use prn;

ERROR 42000: Unknown database 'prn'