Commit 47175761 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 

into  poseidon.:/home/tomas/mysql-5.1-new-ndb


storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
parents 6ffa052d 4f27b308

BUILD/check-cpu

+4 −0
Original line number Diff line number Diff line
@@ -114,6 +114,10 @@ check_cpu () { 
    *i386*i486*)

      cpu_arg="pentium-m";

      ;;

    #Core 2 Duo  

    *Intel*Core\(TM\)2*)

      cpu_arg="nocona";

      ;;



    # Intel ia64

    *Itanium*)

EXCEPTIONS-CLIENT

+4 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ The MySQL AB Exception for Free/Libre and Open Source 
Software-only Applications Using MySQL Client Libraries (the

"FLOSS Exception").



Version 0.5, 30 August 2006

Version 0.6, 7 March 2007



Exception Intent
@@ -59,10 +59,12 @@ Apache Software License 1.0/1.1/2.0 
Apple Public Source License 2.0

Artistic license From Perl 5.8.0

BSD license "July 22 1999"

Common Development and Distribution License (CDDL) 1.0

Common Public License 1.0

Eclipse Public License 1.0

GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1

Jabber Open Source License 1.0

MIT license ---

MIT license (As listed in file MIT-License.txt) ---

Mozilla Public License (MPL) 1.0/1.1

Open Software License 2.0

OpenSSL license (with original SSLeay license) "2003" ("1998")

configure.in

+3 −2
Original line number Diff line number Diff line
@@ -739,8 +739,9 @@ AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind)) 
# Check if crypt() exists in libc or libcrypt, sets LIBS if needed

AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))



# For sem_xxx functions on Solaris 2.6

AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))

# For the sched_yield() function on Solaris

AC_CHECK_FUNC(sched_yield, , AC_CHECK_LIB(posix4, sched_yield))



MYSQL_CHECK_ZLIB_WITH_COMPRESS



# For large pages support

include/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \ 
			my_list.h my_alloc.h typelib.h

pkginclude_HEADERS =	$(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \

			my_xml.h mysql_embed.h \

		  	my_semaphore.h my_pthread.h my_no_pthread.h \

		  	my_pthread.h my_no_pthread.h \

			errmsg.h my_global.h my_net.h \

			my_getopt.h sslopt-longopts.h my_dir.h \

			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \

include/my_semaphore.h

deleted100644 → 0
+0 −64
Original line number Diff line number Diff line 
/*

 * Module: semaphore.h

 *

 * Purpose:

 *      Semaphores aren't actually part of the PThreads standard.

 *      They are defined by the POSIX Standard:

 *

 *              POSIX 1003.1b-1993      (POSIX.1b)

 *

 * Pthreads-win32 - POSIX Threads Library for Win32

 * Copyright (C) 1998

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Library General Public

 * License as published by the Free Software Foundation; either

 * version 2 of the License, or (at your option) any later version.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * Library General Public License for more details.

 *

 * You should have received a copy of the GNU Library General Public

 * License along with this library; if not, write to the Free

 * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,

 * MA 02111-1307, USA

 */



/* This is hacked by Monty to be included in mysys library */



#ifndef _my_semaphore_h_

#define _my_semaphore_h_



#ifdef THREAD



C_MODE_START

#ifdef HAVE_SEMAPHORE_H

#include <semaphore.h>

#elif !defined(__bsdi__)

#ifdef __WIN__

typedef HANDLE sem_t;

#else

typedef struct {

  pthread_mutex_t mutex;

  pthread_cond_t  cond;

  uint            count;

} sem_t;

#endif /* __WIN__ */



int sem_init(sem_t * sem, int pshared, unsigned int value);

int sem_destroy(sem_t * sem);

int sem_trywait(sem_t * sem);

int sem_wait(sem_t * sem);

int sem_post(sem_t * sem);

int sem_post_multiple(sem_t * sem, unsigned int count);

int sem_getvalue(sem_t * sem, unsigned int * sval);



#endif /* !__bsdi__ */



C_MODE_END



#endif /* THREAD */



#endif /* !_my_semaphore_h_ */