1 --- a/storage/innodb_plugin/plug.in
2 +++ b/storage/innodb_plugin/plug.in
3 @@ -56,10 +56,8 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin, [
5 AC_SUBST(INNODB_DYNAMIC_CFLAGS)
7 - AC_MSG_CHECKING(whether GCC atomic builtins are available)
8 - # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
11 + AC_CACHE_CHECK([whether GCC atomic builtins are available],
12 + [mysql_cv_gcc_atomic_builtins], [AC_TRY_RUN([
16 @@ -96,21 +94,18 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin, [
22 - AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1],
23 - [GCC atomic builtins are available])
30 + ], [mysql_cv_gcc_atomic_builtins=yes],
31 + [mysql_cv_gcc_atomic_builtins=no],
32 + [mysql_cv_gcc_atomic_builtins=no])])
34 + if test "x$mysql_cv_gcc_atomic_builtins" = xyes; then
35 + AC_DEFINE(HAVE_IB_GCC_ATOMIC_BUILTINS, 1,
36 + [Define to 1 if compiler provides atomic builtins.])
39 - AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins)
40 - # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
44 + AC_CACHE_CHECK([whether pthread_t can be used by GCC atomic builtins],
45 + [mysql_cv_gcc_atomic_builtins_pthread_t], [AC_TRY_RUN([
49 @@ -127,16 +122,14 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin, [
55 - AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1],
56 - [pthread_t can be used by GCC atomic builtins])
63 + ], [mysql_cv_gcc_atomic_builtins_pthread_t=yes],
64 + [mysql_cv_gcc_atomic_builtins_pthread_t=no],
65 + [mysql_cv_gcc_atomic_builtins_pthread_t=no])])
67 + if test "x$mysql_cv_gcc_atomic_builtins_pthread_t" = xyes; then
68 + AC_DEFINE(HAVE_IB_ATOMIC_PTHREAD_T_GCC, 1,
69 + [Define to 1 if pthread_t can be used by GCC atomic builtins])
72 AC_MSG_CHECKING(whether Solaris libc atomic functions are available)
73 # Define HAVE_IB_SOLARIS_ATOMICS if _all_ of the following
74 @@ -156,7 +149,6 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin, [
75 AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1],
76 [Define to 1 if Solaris libc atomic functions are available]
80 AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions)
81 # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
82 @@ -230,6 +222,8 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin, [
91 --- a/sql/gen_lex_hash.cc
92 +++ b/sql/gen_lex_hash.cc
93 @@ -344,55 +344,6 @@ void print_find_structs()
97 -static void usage(int version)
99 - printf("%s Ver 3.6 Distrib %s, for %s (%s)\n",
100 - my_progname, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
103 - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
104 - puts("This program generates a perfect hashing function for the sql_lex.cc");
105 - printf("Usage: %s [OPTIONS]\n\n", my_progname);
106 - my_print_help(my_long_options);
111 -get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
112 - char *argument __attribute__((unused)))
123 - DBUG_PUSH(argument ? argument : default_dbug_option);
130 -static int get_options(int argc, char **argv)
134 - if ((ho_error= handle_options(&argc, &argv, my_long_options, get_one_option)))
146 int check_dup_symbols(SYMBOL *s1, SYMBOL *s2)
148 if (s1->length!=s2->length || strncmp(s1->name,s2->name,s1->length))
149 @@ -443,12 +394,6 @@ int check_duplicates()
151 int main(int argc,char **argv)
154 - DBUG_PROCESS(argv[0]);
156 - if (get_options(argc,(char **) argv))
159 /* Broken up to indicate that it's not advice to you, gentle reader. */
160 printf("/*\n\n Do " "not " "edit " "this " "file " "directly!\n\n*/\n");
162 @@ -549,7 +494,6 @@ static SYMBOL *get_hash_symbol(const cha
170 --- a/sql/Makefile.am
171 +++ b/sql/Makefile.am
172 @@ -26,7 +26,6 @@ INCLUDES = @ZLIB_INCLUDES@ \
175 libexec_PROGRAMS = mysqld
176 -EXTRA_PROGRAMS = gen_lex_hash
177 bin_PROGRAMS = mysql_tzinfo_to_sql
179 noinst_LTLIBRARIES= libndb.la \