Commit 9bd02618 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/usr/home/bar/mysql-4.1.b9948


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 50c44c9b c9415fd4

Makefile.am

+5 −0
Original line number Diff line number Diff line
@@ -116,3 +116,8 @@ test: 
		--master_port=$(MYSQL_TEST_MASTER_PORT) \

		--slave_port=$(MYSQL_TEST_SLAVE_PORT) \

		--ndbcluster_port=$(MYSQL_TEST_NDB_PORT)



test-force:

	cd mysql-test; \

	./mysql-test-run --force ;\

	./mysql-test-run --ps-protocol --force

client/mysqltest.c

+701 −405

File changed.

Preview size limit exceeded, changes collapsed.

configure.in

+7 −0
Original line number Diff line number Diff line
@@ -2043,6 +2043,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
@@ -310,6 +310,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 */

isam/extra.c

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ int nisam_extra(N_INFO *info, enum ha_extra_function function) 
      break;

    }

#endif

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

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

    if ((info->options & HA_OPTION_COMPRESS_RECORD))

    {

      pthread_mutex_lock(&info->s->intern_lock);
@@ -144,7 +144,7 @@ int nisam_extra(N_INFO *info, enum ha_extra_function function) 
      info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED);

      error=end_io_cache(&info->rec_cache);

    }

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

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

    if (info->opt_flag & MEMMAP_USED)

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

#endif