mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
Remove ut0auxconf.h.
It was needed when InnoDB Plugin was distributed independently of MySQL. Approved by Vasil Dimov.
This commit is contained in:
Marko Mäkelä
parent
07ebf63261
commit
3578a30fc4
10 changed files with 1 additions and 293 deletions
|
|
@ -565,7 +565,7 @@ RECURSIVE = YES
|
|||
# excluded from the INPUT source files. This way you can easily exclude a
|
||||
# subdirectory from a directory tree whose root is specified with the INPUT tag.
|
||||
|
||||
EXCLUDE = ut0auxconf_*
|
||||
EXCLUDE =
|
||||
|
||||
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
|
||||
# directories that are symbolic links (a Unix filesystem feature) are excluded
|
||||
|
|
|
|||
|
|
@ -207,7 +207,6 @@ noinst_HEADERS= \
|
|||
include/usr0sess.h \
|
||||
include/usr0sess.ic \
|
||||
include/usr0types.h \
|
||||
include/ut0auxconf.h \
|
||||
include/ut0byte.h \
|
||||
include/ut0byte.ic \
|
||||
include/ut0dbg.h \
|
||||
|
|
|
|||
|
|
@ -78,19 +78,6 @@ the virtual method table (vtable) in GCC 3. */
|
|||
# define ha_innobase ha_innodb
|
||||
#endif /* MYSQL_DYNAMIC_PLUGIN */
|
||||
|
||||
/* if any of the following macros is defined at this point this means
|
||||
that the code from the "right" plug.in was executed and we do not
|
||||
need to include ut0auxconf.h which would either define the same macros
|
||||
or will be empty */
|
||||
#if !defined(HAVE_IB_GCC_ATOMIC_BUILTINS) \
|
||||
&& !defined(HAVE_IB_ATOMIC_PTHREAD_T_GCC) \
|
||||
&& !defined(HAVE_IB_SOLARIS_ATOMICS) \
|
||||
&& !defined(HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS) \
|
||||
&& !defined(SIZEOF_PTHREAD_T) \
|
||||
&& !defined(HAVE_IB_PAUSE_INSTRUCTION)
|
||||
# include "ut0auxconf.h"
|
||||
#endif
|
||||
|
||||
#if (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)) && !defined(MYSQL_SERVER) && !defined(__WIN__)
|
||||
# undef __WIN__
|
||||
# define __WIN__
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
/* Do not remove this file even though it is empty.
|
||||
This file is included in univ.i and will cause compilation failure
|
||||
if not present.
|
||||
A custom checks have been added in the generated
|
||||
storage/innobase/Makefile.in that is shipped with the InnoDB Plugin
|
||||
source archive. These checks eventually define some macros and put
|
||||
them in this file.
|
||||
This is a hack that has been developed in order to deploy new compile
|
||||
time checks without the need to regenerate the ./configure script that is
|
||||
distributed in the MySQL 5.1 official source archives.
|
||||
If by any chance Makefile.in and ./configure are regenerated and thus
|
||||
the hack from Makefile.in wiped away then the "real" checks from plug.in
|
||||
will take over.
|
||||
*/
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
/*****************************************************************************
|
||||
|
||||
Copyright (c) 2009, Innobase Oy. All Rights Reserved.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify it under
|
||||
the terms of the GNU General Public License as published by the Free Software
|
||||
Foundation; version 2 of the License.
|
||||
|
||||
This program 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 General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along with
|
||||
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
||||
Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
*****************************************************************************/
|
||||
|
||||
/*****************************************************************************
|
||||
If this program compiles, then pthread_t objects can be used as arguments
|
||||
to GCC atomic builtin functions.
|
||||
|
||||
Created March 5, 2009 Vasil Dimov
|
||||
*****************************************************************************/
|
||||
|
||||
#include <pthread.h>
|
||||
#include <string.h>
|
||||
|
||||
int
|
||||
main(int argc, char** argv)
|
||||
{
|
||||
pthread_t x1;
|
||||
pthread_t x2;
|
||||
pthread_t x3;
|
||||
|
||||
memset(&x1, 0x0, sizeof(x1));
|
||||
memset(&x2, 0x0, sizeof(x2));
|
||||
memset(&x3, 0x0, sizeof(x3));
|
||||
|
||||
__sync_bool_compare_and_swap(&x1, x2, x3);
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
/*****************************************************************************
|
||||
|
||||
Copyright (c) 2009, Innobase Oy. All Rights Reserved.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify it under
|
||||
the terms of the GNU General Public License as published by the Free Software
|
||||
Foundation; version 2 of the License.
|
||||
|
||||
This program 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 General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along with
|
||||
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
||||
Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
*****************************************************************************/
|
||||
|
||||
/*****************************************************************************
|
||||
If this program compiles and returns 0, then pthread_t objects can be used as
|
||||
arguments to Solaris libc atomic functions.
|
||||
|
||||
Created April 18, 2009 Vasil Dimov
|
||||
*****************************************************************************/
|
||||
|
||||
#include <pthread.h>
|
||||
#include <string.h>
|
||||
|
||||
int
|
||||
main(int argc, char** argv)
|
||||
{
|
||||
pthread_t x1;
|
||||
pthread_t x2;
|
||||
pthread_t x3;
|
||||
|
||||
memset(&x1, 0x0, sizeof(x1));
|
||||
memset(&x2, 0x0, sizeof(x2));
|
||||
memset(&x3, 0x0, sizeof(x3));
|
||||
|
||||
if (sizeof(pthread_t) == 4) {
|
||||
|
||||
atomic_cas_32(&x1, x2, x3);
|
||||
|
||||
} else if (sizeof(pthread_t) == 8) {
|
||||
|
||||
atomic_cas_64(&x1, x2, x3);
|
||||
|
||||
} else {
|
||||
|
||||
return(1);
|
||||
}
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
/*****************************************************************************
|
||||
|
||||
Copyright (c) 2009, Innobase Oy. All Rights Reserved.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify it under
|
||||
the terms of the GNU General Public License as published by the Free Software
|
||||
Foundation; version 2 of the License.
|
||||
|
||||
This program 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 General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along with
|
||||
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
||||
Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
*****************************************************************************/
|
||||
|
||||
/*****************************************************************************
|
||||
If this program compiles and returns 0, then GCC atomic funcions are available.
|
||||
|
||||
Created September 12, 2009 Vasil Dimov
|
||||
*****************************************************************************/
|
||||
|
||||
int
|
||||
main(int argc, char** argv)
|
||||
{
|
||||
long x;
|
||||
long y;
|
||||
long res;
|
||||
char c;
|
||||
|
||||
x = 10;
|
||||
y = 123;
|
||||
res = __sync_bool_compare_and_swap(&x, x, y);
|
||||
if (!res || x != y) {
|
||||
return(1);
|
||||
}
|
||||
|
||||
x = 10;
|
||||
y = 123;
|
||||
res = __sync_bool_compare_and_swap(&x, x + 1, y);
|
||||
if (res || x != 10) {
|
||||
return(1);
|
||||
}
|
||||
|
||||
x = 10;
|
||||
y = 123;
|
||||
res = __sync_add_and_fetch(&x, y);
|
||||
if (res != 123 + 10 || x != 123 + 10) {
|
||||
return(1);
|
||||
}
|
||||
|
||||
c = 10;
|
||||
res = __sync_lock_test_and_set(&c, 123);
|
||||
if (res != 10 || c != 123) {
|
||||
return(1);
|
||||
}
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
/*****************************************************************************
|
||||
|
||||
Copyright (c) 2009, Innobase Oy. All Rights Reserved.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify it under
|
||||
the terms of the GNU General Public License as published by the Free Software
|
||||
Foundation; version 2 of the License.
|
||||
|
||||
This program 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 General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along with
|
||||
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
||||
Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
*****************************************************************************/
|
||||
|
||||
/*****************************************************************************
|
||||
If this program compiles, then Solaris libc atomic funcions are available.
|
||||
|
||||
Created April 18, 2009 Vasil Dimov
|
||||
*****************************************************************************/
|
||||
#include <atomic.h>
|
||||
|
||||
int
|
||||
main(int argc, char** argv)
|
||||
{
|
||||
ulong_t ulong = 0;
|
||||
uint32_t uint32 = 0;
|
||||
uint64_t uint64 = 0;
|
||||
|
||||
atomic_cas_ulong(&ulong, 0, 1);
|
||||
atomic_cas_32(&uint32, 0, 1);
|
||||
atomic_cas_64(&uint64, 0, 1);
|
||||
atomic_add_long(&ulong, 0);
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
/*****************************************************************************
|
||||
|
||||
Copyright (c) 2009, Innobase Oy. All Rights Reserved.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify it under
|
||||
the terms of the GNU General Public License as published by the Free Software
|
||||
Foundation; version 2 of the License.
|
||||
|
||||
This program 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 General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along with
|
||||
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
||||
Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
*****************************************************************************/
|
||||
|
||||
/*****************************************************************************
|
||||
If this program compiles and can be run and returns 0, then the pause
|
||||
instruction is available.
|
||||
|
||||
Created Jul 21, 2009 Vasil Dimov
|
||||
*****************************************************************************/
|
||||
|
||||
int
|
||||
main(int argc, char** argv)
|
||||
{
|
||||
__asm__ __volatile__ ("pause");
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
/*****************************************************************************
|
||||
|
||||
Copyright (c) 2009, Innobase Oy. All Rights Reserved.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify it under
|
||||
the terms of the GNU General Public License as published by the Free Software
|
||||
Foundation; version 2 of the License.
|
||||
|
||||
This program 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 General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along with
|
||||
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
||||
Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
*****************************************************************************/
|
||||
|
||||
/*****************************************************************************
|
||||
This program should compile and when run, print a single line like:
|
||||
#define SIZEOF_PTHREAD_T %d
|
||||
|
||||
Created April 18, 2009 Vasil Dimov
|
||||
*****************************************************************************/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <pthread.h>
|
||||
|
||||
int
|
||||
main(int argc, char** argv)
|
||||
{
|
||||
printf("#define SIZEOF_PTHREAD_T %d\n", (int) sizeof(pthread_t));
|
||||
|
||||
return(0);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue