3 @@ -902,10 +902,6 @@ plugin_blackhole_static_target
4 plugin_blackhole_shared_target
5 plugin_archive_static_target
6 plugin_archive_shared_target
7 -plugin_ftexample_static_target
8 -plugin_ftexample_shared_target
9 -plugin_daemon_example_static_target
10 -plugin_daemon_example_shared_target
11 plugin_partition_shared_target
12 plugin_partition_static_target
14 @@ -1946,10 +1942,9 @@ Optional Packages:
16 Available configurations are: none max max-no-ndb
18 - Available plugins are: partition daemon_example
19 - ftexample archive blackhole csv example federated
20 - heap ibmdb2i innobase innodb_plugin myisam myisammrg
22 + Available plugins are: partition archive blackhole
23 + csv example federated heap ibmdb2i innobase
24 + innodb_plugin myisam myisammrg ndbcluster.
25 --without-plugin-PLUGIN Disable the named plugin from being built.
26 Otherwise, for plugins which are not selected for
27 inclusion in mysqld will be built dynamically (if
28 @@ -2013,16 +2008,6 @@ Description of plugins:
29 Supports build: static
30 Configurations: max, max-no-ndb
32 - === Daemon Example Plugin ===
33 - Plugin Name: daemon_example
34 - Description: This is an example plugin daemon.
35 - Supports build: dynamic
37 - === Simple Parser ===
38 - Plugin Name: ftexample
39 - Description: Simple full-text parser plugin
40 - Supports build: dynamic
42 === Archive Storage Engine ===
44 Description: Archive Storage Engine
45 @@ -4965,13 +4950,13 @@ if test "${lt_cv_nm_interface+set}" = se
47 lt_cv_nm_interface="BSD nm"
48 echo "int some_variable = 0;" > conftest.$ac_ext
49 - (eval echo "\"\$as_me:4968: $ac_compile\"" >&5)
50 + (eval echo "\"\$as_me:4953: $ac_compile\"" >&5)
51 (eval "$ac_compile" 2>conftest.err)
53 - (eval echo "\"\$as_me:4971: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
54 + (eval echo "\"\$as_me:4956: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
55 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
57 - (eval echo "\"\$as_me:4974: output\"" >&5)
58 + (eval echo "\"\$as_me:4959: output\"" >&5)
60 if $GREP 'External.*some_variable' conftest.out > /dev/null; then
61 lt_cv_nm_interface="MS dumpbin"
62 @@ -6177,7 +6162,7 @@ ia64-*-hpux*)
65 # Find out which ABI we are using.
66 - echo '#line 6180 "configure"' > conftest.$ac_ext
67 + echo '#line 6165 "configure"' > conftest.$ac_ext
68 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
69 (eval $ac_compile) 2>&5
71 @@ -8030,11 +8015,11 @@ else
72 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
73 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
74 -e 's:$: $lt_compiler_flag:'`
75 - (eval echo "\"\$as_me:8033: $lt_compile\"" >&5)
76 + (eval echo "\"\$as_me:8018: $lt_compile\"" >&5)
77 (eval "$lt_compile" 2>conftest.err)
80 - echo "$as_me:8037: \$? = $ac_status" >&5
81 + echo "$as_me:8022: \$? = $ac_status" >&5
82 if (exit $ac_status) && test -s "$ac_outfile"; then
83 # The compiler can only warn and ignore the option if not recognized
84 # So say no if there are warnings other than the usual output.
85 @@ -8369,11 +8354,11 @@ else
86 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
87 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
88 -e 's:$: $lt_compiler_flag:'`
89 - (eval echo "\"\$as_me:8372: $lt_compile\"" >&5)
90 + (eval echo "\"\$as_me:8357: $lt_compile\"" >&5)
91 (eval "$lt_compile" 2>conftest.err)
94 - echo "$as_me:8376: \$? = $ac_status" >&5
95 + echo "$as_me:8361: \$? = $ac_status" >&5
96 if (exit $ac_status) && test -s "$ac_outfile"; then
97 # The compiler can only warn and ignore the option if not recognized
98 # So say no if there are warnings other than the usual output.
99 @@ -8474,11 +8459,11 @@ else
100 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
101 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
102 -e 's:$: $lt_compiler_flag:'`
103 - (eval echo "\"\$as_me:8477: $lt_compile\"" >&5)
104 + (eval echo "\"\$as_me:8462: $lt_compile\"" >&5)
105 (eval "$lt_compile" 2>out/conftest.err)
107 cat out/conftest.err >&5
108 - echo "$as_me:8481: \$? = $ac_status" >&5
109 + echo "$as_me:8466: \$? = $ac_status" >&5
110 if (exit $ac_status) && test -s out/conftest2.$ac_objext
112 # The compiler can only warn and ignore the option if not recognized
113 @@ -8529,11 +8514,11 @@ else
114 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
115 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
116 -e 's:$: $lt_compiler_flag:'`
117 - (eval echo "\"\$as_me:8532: $lt_compile\"" >&5)
118 + (eval echo "\"\$as_me:8517: $lt_compile\"" >&5)
119 (eval "$lt_compile" 2>out/conftest.err)
121 cat out/conftest.err >&5
122 - echo "$as_me:8536: \$? = $ac_status" >&5
123 + echo "$as_me:8521: \$? = $ac_status" >&5
124 if (exit $ac_status) && test -s out/conftest2.$ac_objext
126 # The compiler can only warn and ignore the option if not recognized
127 @@ -11329,7 +11314,7 @@ else
128 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
129 lt_status=$lt_dlunknown
130 cat > conftest.$ac_ext <<_LT_EOF
131 -#line 11332 "configure"
132 +#line 11317 "configure"
133 #include "confdefs.h"
136 @@ -11425,7 +11410,7 @@ else
137 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
138 lt_status=$lt_dlunknown
139 cat > conftest.$ac_ext <<_LT_EOF
140 -#line 11428 "configure"
141 +#line 11413 "configure"
142 #include "confdefs.h"
145 @@ -16938,11 +16923,11 @@ else
146 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
147 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
148 -e 's:$: $lt_compiler_flag:'`
149 - (eval echo "\"\$as_me:16941: $lt_compile\"" >&5)
150 + (eval echo "\"\$as_me:16926: $lt_compile\"" >&5)
151 (eval "$lt_compile" 2>conftest.err)
154 - echo "$as_me:16945: \$? = $ac_status" >&5
155 + echo "$as_me:16930: \$? = $ac_status" >&5
156 if (exit $ac_status) && test -s "$ac_outfile"; then
157 # The compiler can only warn and ignore the option if not recognized
158 # So say no if there are warnings other than the usual output.
159 @@ -17037,11 +17022,11 @@ else
160 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
161 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
162 -e 's:$: $lt_compiler_flag:'`
163 - (eval echo "\"\$as_me:17040: $lt_compile\"" >&5)
164 + (eval echo "\"\$as_me:17025: $lt_compile\"" >&5)
165 (eval "$lt_compile" 2>out/conftest.err)
167 cat out/conftest.err >&5
168 - echo "$as_me:17044: \$? = $ac_status" >&5
169 + echo "$as_me:17029: \$? = $ac_status" >&5
170 if (exit $ac_status) && test -s out/conftest2.$ac_objext
172 # The compiler can only warn and ignore the option if not recognized
173 @@ -17089,11 +17074,11 @@ else
174 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
175 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
176 -e 's:$: $lt_compiler_flag:'`
177 - (eval echo "\"\$as_me:17092: $lt_compile\"" >&5)
178 + (eval echo "\"\$as_me:17077: $lt_compile\"" >&5)
179 (eval "$lt_compile" 2>out/conftest.err)
181 cat out/conftest.err >&5
182 - echo "$as_me:17096: \$? = $ac_status" >&5
183 + echo "$as_me:17081: \$? = $ac_status" >&5
184 if (exit $ac_status) && test -s out/conftest2.$ac_objext
186 # The compiler can only warn and ignore the option if not recognized
187 @@ -26456,120 +26441,6 @@ done
191 -# System characteristics
192 -case $SYSTEM_TYPE in
195 -{ $as_echo "$as_me:$LINENO: checking for restartable system calls" >&5
196 -$as_echo_n "checking for restartable system calls... " >&6; }
197 -if test "${ac_cv_sys_restartable_syscalls+set}" = set; then
198 - $as_echo_n "(cached) " >&6
200 - if test "$cross_compiling" = yes; then
201 - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
202 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
203 -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
204 -See \`config.log' for more details." >&5
205 -$as_echo "$as_me: error: cannot run test program while cross compiling
206 -See \`config.log' for more details." >&2;}
207 - { (exit 1); exit 1; }; }; }
209 - cat >conftest.$ac_ext <<_ACEOF
212 -cat confdefs.h >>conftest.$ac_ext
213 -cat >>conftest.$ac_ext <<_ACEOF
214 -/* end confdefs.h. */
215 -/* Exit 0 (true) if wait returns something other than -1,
216 - i.e. the pid of the child, which means that wait was restarted
217 - after getting the signal. */
219 -$ac_includes_default
221 -#ifdef HAVE_SYS_WAIT_H
222 -# include <sys/wait.h>
225 -/* Some platforms explicitly require an extern "C" signal handler
228 -extern "C" void ucatch (int dummy) { }
230 -void ucatch (dummy) int dummy; { }
236 - int i = fork (), status;
241 - kill (getppid (), SIGINT);
246 - signal (SIGINT, ucatch);
248 - status = wait (&i);
252 - return status == -1;
255 -rm -f conftest$ac_exeext
256 -if { (ac_try="$ac_link"
258 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
259 - *) ac_try_echo=$ac_try;;
261 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
262 -$as_echo "$ac_try_echo") >&5
263 - (eval "$ac_link") 2>&5
265 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
266 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
267 - { (case "(($ac_try" in
268 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
269 - *) ac_try_echo=$ac_try;;
271 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
272 -$as_echo "$ac_try_echo") >&5
273 - (eval "$ac_try") 2>&5
275 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
276 - (exit $ac_status); }; }; then
277 - ac_cv_sys_restartable_syscalls=yes
279 - $as_echo "$as_me: program exited with status $ac_status" >&5
280 -$as_echo "$as_me: failed program was:" >&5
281 -sed 's/^/| /' conftest.$ac_ext >&5
284 -ac_cv_sys_restartable_syscalls=no
286 -rm -rf conftest.dSYM
287 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
292 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_restartable_syscalls" >&5
293 -$as_echo "$ac_cv_sys_restartable_syscalls" >&6; }
294 -if test $ac_cv_sys_restartable_syscalls = yes; then
296 -cat >>confdefs.h <<\_ACEOF
297 -#define HAVE_RESTARTABLE_SYSCALLS 1
305 # Build optimized or debug version ?
306 # First check for gcc and g++
307 if test "$GCC" = "yes"
308 @@ -26923,84 +26794,6 @@ $as_echo "$as_me: error: \"$with_atomic_
309 { (exit 1); exit 1; }; } ;;
312 -{ $as_echo "$as_me:$LINENO: checking whether the compiler provides atomic builtins" >&5
313 -$as_echo_n "checking whether the compiler provides atomic builtins... " >&6; }
314 -if test "${mysql_cv_gcc_atomic_builtins+set}" = set; then
315 - $as_echo_n "(cached) " >&6
317 - if test "$cross_compiling" = yes; then
318 - mysql_cv_gcc_atomic_builtins=no
320 - cat >conftest.$ac_ext <<_ACEOF
323 -cat confdefs.h >>conftest.$ac_ext
324 -cat >>conftest.$ac_ext <<_ACEOF
325 -/* end confdefs.h. */
329 - int foo= -10; int bar= 10;
330 - if (!__sync_fetch_and_add(&foo, bar) || foo)
332 - bar= __sync_lock_test_and_set(&foo, bar);
333 - if (bar || foo != 10)
335 - bar= __sync_val_compare_and_swap(&bar, foo, 15);
342 -rm -f conftest$ac_exeext
343 -if { (ac_try="$ac_link"
345 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
346 - *) ac_try_echo=$ac_try;;
348 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
349 -$as_echo "$ac_try_echo") >&5
350 - (eval "$ac_link") 2>&5
352 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
353 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
354 - { (case "(($ac_try" in
355 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
356 - *) ac_try_echo=$ac_try;;
358 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
359 -$as_echo "$ac_try_echo") >&5
360 - (eval "$ac_try") 2>&5
362 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
363 - (exit $ac_status); }; }; then
364 - mysql_cv_gcc_atomic_builtins=yes
366 - $as_echo "$as_me: program exited with status $ac_status" >&5
367 -$as_echo "$as_me: failed program was:" >&5
368 -sed 's/^/| /' conftest.$ac_ext >&5
371 -mysql_cv_gcc_atomic_builtins=no
373 -rm -rf conftest.dSYM
374 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
379 -{ $as_echo "$as_me:$LINENO: result: $mysql_cv_gcc_atomic_builtins" >&5
380 -$as_echo "$mysql_cv_gcc_atomic_builtins" >&6; }
382 -if test "x$mysql_cv_gcc_atomic_builtins" = xyes; then
384 -cat >>confdefs.h <<\_ACEOF
385 -#define HAVE_GCC_ATOMIC_BUILTINS 1
390 # Force static compilation to avoid linking problems/get more speed
392 # Check whether --with-mysqld-ldflags was given.
393 @@ -40520,100 +40313,6 @@ fi
491 if test "${with_archive_storage_engine+set}" = set; then
492 with_plugin_archive="$with_archive_storage_engine"
494 @@ -42056,10 +41755,6 @@ fi
502 # Check whether --with-plugins was given.
503 if test "${with_plugins+set}" = set; then
504 withval=$with_plugins; mysql_plugins="`echo $withval | tr ',.:;*' ' '`"
505 @@ -42072,7 +41767,7 @@ fi
507 case "$mysql_plugins" in
509 - mysql_plugins='partition daemon_example ftexample archive blackhole csv example federated heap ibmdb2i innobase innodb_plugin myisam myisammrg ndbcluster'
510 + mysql_plugins='partition archive blackhole csv example federated heap ibmdb2i innobase innodb_plugin myisam myisammrg ndbcluster'
514 @@ -42124,36 +41819,6 @@ $as_echo "$as_me: error: bad plugin name
522 - { $as_echo "$as_me:$LINENO: WARNING: Daemon Example Plugin can only be built as a plugin" >&5
523 -$as_echo "$as_me: WARNING: Daemon Example Plugin can only be built as a plugin" >&2;}
537 - { $as_echo "$as_me:$LINENO: WARNING: Simple Parser can only be built as a plugin" >&5
538 -$as_echo "$as_me: WARNING: Simple Parser can only be built as a plugin" >&2;}
551 @@ -42343,10 +42008,6 @@ $as_echo "$as_me: WARNING: InnoDB Storag
560 { { $as_echo "$as_me:$LINENO: error: unknown plugin: $plugin" >&5
561 $as_echo "$as_me: error: unknown plugin: $plugin" >&2;}
562 @@ -42419,16 +42080,6 @@ $as_echo "$as_me: error: unknown plugin:
576 if test "X$mysql_plugin_ndbcluster" = Xyes -a \
577 "X$with_plugin_ndbcluster" != Xno -o \
578 "X$with_plugin_ndbcluster" = Xyes; then
579 @@ -42489,10 +42140,6 @@ $as_echo "$as_me: error: depends upon di
587 { $as_echo "$as_me:$LINENO: checking whether to use Partition Support" >&5
588 $as_echo_n "checking whether to use Partition Support... " >&6; }
589 mysql_use_plugin_dir=""
590 @@ -42561,236 +42208,6 @@ $as_echo "yes" >&6; }
594 - { $as_echo "$as_me:$LINENO: checking whether to use Daemon Example Plugin" >&5
595 -$as_echo_n "checking whether to use Daemon Example Plugin... " >&6; }
596 - mysql_use_plugin_dir=""
599 - # Plugin is not disabled, determine if it should be built,
600 - # or only distributed
603 - if test ! -d "$srcdir/plugin/daemon_example"; then
604 - # Plugin directory was removed after autoconf was run; treat
605 - # this as a disabled plugin
606 - if test "X$with_plugin_daemon_example" = Xyes; then
607 - { $as_echo "$as_me:$LINENO: result: error" >&5
608 -$as_echo "error" >&6; }
609 - { { $as_echo "$as_me:$LINENO: error: disabled" >&5
610 -$as_echo "$as_me: error: disabled" >&2;}
611 - { (exit 1); exit 1; }; }
614 - # The result message will be printed below
615 - with_plugin_daemon_example=no
620 - case "$with_mysqld_ldflags " in
622 - # No need to build shared plugins when mysqld is linked with
623 - # -all-static as it won't be able to load them.
624 - if test "X$mysql_plugin_daemon_example" != Xyes -a \
625 - "X$with_plugin_daemon_example" != Xyes; then
626 - with_plugin_daemon_example=no
633 - if test "X$with_plugin_daemon_example" = Xno; then
634 - { $as_echo "$as_me:$LINENO: result: no" >&5
635 -$as_echo "no" >&6; }
637 - with_plugin_daemon_example=''
638 - if test "X$mysql_plugin_daemon_example" != Xyes -a \
639 - "X$with_plugin_daemon_example" != Xyes; then
642 - if test -d "$srcdir/plugin/daemon_example" ; then
643 - mysql_use_plugin_dir="plugin/daemon_example"
645 - plugin_daemon_example_shared_target="libdaemon_example.la"
647 - plugin_daemon_example_static_target=""
649 - with_plugin_daemon_example=yes
650 - { $as_echo "$as_me:$LINENO: result: plugin" >&5
651 -$as_echo "plugin" >&6; }
654 - mysql_plugin_daemon_example=no
655 - { $as_echo "$as_me:$LINENO: result: no" >&5
656 -$as_echo "no" >&6; }
663 - { $as_echo "$as_me:$LINENO: result: error" >&5
664 -$as_echo "error" >&6; }
665 - { { $as_echo "$as_me:$LINENO: error: Plugin daemon_example does not support static linking" >&5
666 -$as_echo "$as_me: error: Plugin daemon_example does not support static linking" >&2;}
667 - { (exit 1); exit 1; }; }
670 - mysql_plugin_defs="$mysql_plugin_defs, builtin_daemon_example_plugin"
671 - with_plugin_daemon_example=yes
672 - { $as_echo "$as_me:$LINENO: result: yes" >&5
673 -$as_echo "yes" >&6; }
679 - if test -d "$srcdir/plugin/daemon_example"; then
680 - # Even if we don't build a plugin, we bundle its source into the dist
681 - # file. So its Makefile (and Makefiles for any subdirs) must be
682 - # generated for 'make dist' to work.
685 - # autoconf doesn't provide an automatic way to configure DIST_SUBDIRS of
686 - # a subdir; for our purposes, it's enough to just check for existing
687 - # Makefile.am files and add them in here
688 - ac_config_files="$ac_config_files plugin/daemon_example/Makefile"
694 - mysql_pg_distdirs="$mysql_pg_distdirs daemon_example"
695 - if test -n "$mysql_use_plugin_dir" ; then
696 - mysql_pg_dirs="$mysql_pg_dirs daemon_example"
697 - mysql_pg_unittest_dirs="$mysql_pg_unittest_dirs ../plugin/daemon_example"
709 - { $as_echo "$as_me:$LINENO: checking whether to use Simple Parser" >&5
710 -$as_echo_n "checking whether to use Simple Parser... " >&6; }
711 - mysql_use_plugin_dir=""
714 - # Plugin is not disabled, determine if it should be built,
715 - # or only distributed
718 - if test ! -d "$srcdir/plugin/fulltext"; then
719 - # Plugin directory was removed after autoconf was run; treat
720 - # this as a disabled plugin
721 - if test "X$with_plugin_ftexample" = Xyes; then
722 - { $as_echo "$as_me:$LINENO: result: error" >&5
723 -$as_echo "error" >&6; }
724 - { { $as_echo "$as_me:$LINENO: error: disabled" >&5
725 -$as_echo "$as_me: error: disabled" >&2;}
726 - { (exit 1); exit 1; }; }
729 - # The result message will be printed below
730 - with_plugin_ftexample=no
735 - case "$with_mysqld_ldflags " in
737 - # No need to build shared plugins when mysqld is linked with
738 - # -all-static as it won't be able to load them.
739 - if test "X$mysql_plugin_ftexample" != Xyes -a \
740 - "X$with_plugin_ftexample" != Xyes; then
741 - with_plugin_ftexample=no
748 - if test "X$with_plugin_ftexample" = Xno; then
749 - { $as_echo "$as_me:$LINENO: result: no" >&5
750 -$as_echo "no" >&6; }
752 - with_plugin_ftexample=''
753 - if test "X$mysql_plugin_ftexample" != Xyes -a \
754 - "X$with_plugin_ftexample" != Xyes; then
757 - if test -d "$srcdir/plugin/fulltext" ; then
758 - mysql_use_plugin_dir="plugin/fulltext"
760 - plugin_ftexample_shared_target="mypluglib.la"
762 - plugin_ftexample_static_target=""
764 - with_plugin_ftexample=yes
765 - { $as_echo "$as_me:$LINENO: result: plugin" >&5
766 -$as_echo "plugin" >&6; }
769 - mysql_plugin_ftexample=no
770 - { $as_echo "$as_me:$LINENO: result: no" >&5
771 -$as_echo "no" >&6; }
778 - { $as_echo "$as_me:$LINENO: result: error" >&5
779 -$as_echo "error" >&6; }
780 - { { $as_echo "$as_me:$LINENO: error: Plugin ftexample does not support static linking" >&5
781 -$as_echo "$as_me: error: Plugin ftexample does not support static linking" >&2;}
782 - { (exit 1); exit 1; }; }
785 - mysql_plugin_defs="$mysql_plugin_defs, builtin_ftexample_plugin"
786 - with_plugin_ftexample=yes
787 - { $as_echo "$as_me:$LINENO: result: yes" >&5
788 -$as_echo "yes" >&6; }
794 - if test -d "$srcdir/plugin/fulltext"; then
795 - # Even if we don't build a plugin, we bundle its source into the dist
796 - # file. So its Makefile (and Makefiles for any subdirs) must be
797 - # generated for 'make dist' to work.
800 - # autoconf doesn't provide an automatic way to configure DIST_SUBDIRS of
801 - # a subdir; for our purposes, it's enough to just check for existing
802 - # Makefile.am files and add them in here
803 - ac_config_files="$ac_config_files plugin/fulltext/Makefile"
809 - mysql_pg_distdirs="$mysql_pg_distdirs fulltext"
810 - if test -n "$mysql_use_plugin_dir" ; then
811 - mysql_pg_dirs="$mysql_pg_dirs fulltext"
812 - mysql_pg_unittest_dirs="$mysql_pg_unittest_dirs ../plugin/fulltext"
827 @@ -44204,7 +43621,7 @@ $as_echo "yes" >&6; }
828 # autoconf doesn't provide an automatic way to configure DIST_SUBDIRS of
829 # a subdir; for our purposes, it's enough to just check for existing
830 # Makefile.am files and add them in here
831 - ac_config_files="$ac_config_files storage/ndb/docs/Makefile storage/ndb/include/Makefile storage/ndb/src/common/debugger/signaldata/Makefile storage/ndb/src/common/debugger/Makefile storage/ndb/src/common/logger/Makefile storage/ndb/src/common/mgmcommon/Makefile storage/ndb/src/common/portlib/Makefile storage/ndb/src/common/transporter/Makefile storage/ndb/src/common/util/Makefile storage/ndb/src/common/Makefile storage/ndb/src/cw/cpcd/Makefile storage/ndb/src/cw/Makefile storage/ndb/src/kernel/blocks/backup/Makefile storage/ndb/src/kernel/blocks/dbdict/Makefile storage/ndb/src/kernel/blocks/dbdih/Makefile storage/ndb/src/kernel/blocks/dblqh/Makefile storage/ndb/src/kernel/blocks/dbtup/Makefile storage/ndb/src/kernel/blocks/Makefile storage/ndb/src/kernel/error/Makefile storage/ndb/src/kernel/vm/Makefile storage/ndb/src/kernel/Makefile storage/ndb/src/mgmapi/Makefile storage/ndb/src/mgmclient/Makefile storage/ndb/src/mgmsrv/Makefile storage/ndb/src/ndbapi/Makefile storage/ndb/src/Makefile storage/ndb/test/ndbapi/bank/Makefile storage/ndb/test/ndbapi/Makefile storage/ndb/test/run-test/Makefile storage/ndb/test/src/Makefile storage/ndb/test/tools/Makefile storage/ndb/test/Makefile storage/ndb/tools/Makefile storage/ndb/Makefile"
832 + ac_config_files="$ac_config_files storage/ndb/Makefile storage/ndb/test/Makefile storage/ndb/test/run-test/Makefile storage/ndb/test/tools/Makefile storage/ndb/test/src/Makefile storage/ndb/test/ndbapi/Makefile storage/ndb/test/ndbapi/bank/Makefile storage/ndb/docs/Makefile storage/ndb/tools/Makefile storage/ndb/include/Makefile storage/ndb/src/Makefile storage/ndb/src/mgmsrv/Makefile storage/ndb/src/cw/Makefile storage/ndb/src/cw/cpcd/Makefile storage/ndb/src/mgmclient/Makefile storage/ndb/src/mgmapi/Makefile storage/ndb/src/common/Makefile storage/ndb/src/common/mgmcommon/Makefile storage/ndb/src/common/portlib/Makefile storage/ndb/src/common/debugger/Makefile storage/ndb/src/common/debugger/signaldata/Makefile storage/ndb/src/common/logger/Makefile storage/ndb/src/common/util/Makefile storage/ndb/src/common/transporter/Makefile storage/ndb/src/kernel/Makefile storage/ndb/src/kernel/blocks/Makefile storage/ndb/src/kernel/blocks/dbdict/Makefile storage/ndb/src/kernel/blocks/dbtup/Makefile storage/ndb/src/kernel/blocks/dbdih/Makefile storage/ndb/src/kernel/blocks/dblqh/Makefile storage/ndb/src/kernel/blocks/backup/Makefile storage/ndb/src/kernel/error/Makefile storage/ndb/src/kernel/vm/Makefile storage/ndb/src/ndbapi/Makefile"
836 @@ -44251,10 +43668,6 @@ $as_echo "yes" >&6; }
844 if test "X$with_plugin_partition" = Xyes; then
845 if test "X$plugin_partition_static_target" = X -a \
846 "X$plugin_partition_shared_target" = X; then
847 @@ -44273,42 +43686,6 @@ $as_echo "$as_me: error: that's strange,
851 - if test "X$with_plugin_daemon_example" = Xyes; then
852 - if test "X$plugin_daemon_example_static_target" = X -a \
853 - "X$plugin_daemon_example_shared_target" = X; then
854 - { { $as_echo "$as_me:$LINENO: error: that's strange, daemon_example failed sanity check" >&5
855 -$as_echo "$as_me: error: that's strange, daemon_example failed sanity check" >&2;}
856 - { (exit 1); exit 1; }; }
869 - if test "X$with_plugin_ftexample" = Xyes; then
870 - if test "X$plugin_ftexample_static_target" = X -a \
871 - "X$plugin_ftexample_shared_target" = X; then
872 - { { $as_echo "$as_me:$LINENO: error: that's strange, ftexample failed sanity check" >&5
873 -$as_echo "$as_me: error: that's strange, ftexample failed sanity check" >&2;}
874 - { (exit 1); exit 1; }; }
887 if test "X$with_plugin_archive" = Xyes; then
888 if test "X$plugin_archive_static_target" = X -a \
889 "X$plugin_archive_shared_target" = X; then
890 @@ -48250,198 +47627,6 @@ $as_echo "$as_me: error: unknown endiann
894 - { $as_echo "$as_me:$LINENO: checking whether GCC atomic builtins are available" >&5
895 -$as_echo_n "checking whether GCC atomic builtins are available... " >&6; }
896 - # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
897 - if test "$cross_compiling" = yes; then
898 - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
899 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
900 -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
901 -See \`config.log' for more details." >&5
902 -$as_echo "$as_me: error: cannot run test program while cross compiling
903 -See \`config.log' for more details." >&2;}
904 - { (exit 1); exit 1; }; }; }
906 - cat >conftest.$ac_ext <<_ACEOF
909 -cat confdefs.h >>conftest.$ac_ext
910 -cat >>conftest.$ac_ext <<_ACEOF
911 -/* end confdefs.h. */
922 - res = __sync_bool_compare_and_swap(&x, x, y);
923 - if (!res || x != y) {
929 - res = __sync_bool_compare_and_swap(&x, x + 1, y);
930 - if (res || x != 10) {
936 - res = __sync_add_and_fetch(&x, y);
937 - if (res != 123 + 10 || x != 123 + 10) {
942 - res = __sync_lock_test_and_set(&c, 123);
943 - if (res != 10 || c != 123) {
951 -rm -f conftest$ac_exeext
952 -if { (ac_try="$ac_link"
954 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
955 - *) ac_try_echo=$ac_try;;
957 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
958 -$as_echo "$ac_try_echo") >&5
959 - (eval "$ac_link") 2>&5
961 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
962 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
963 - { (case "(($ac_try" in
964 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
965 - *) ac_try_echo=$ac_try;;
967 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
968 -$as_echo "$ac_try_echo") >&5
969 - (eval "$ac_try") 2>&5
971 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
972 - (exit $ac_status); }; }; then
975 -cat >>confdefs.h <<\_ACEOF
976 -#define HAVE_IB_GCC_ATOMIC_BUILTINS 1
979 - { $as_echo "$as_me:$LINENO: result: yes" >&5
980 -$as_echo "yes" >&6; }
983 - $as_echo "$as_me: program exited with status $ac_status" >&5
984 -$as_echo "$as_me: failed program was:" >&5
985 -sed 's/^/| /' conftest.$ac_ext >&5
989 - { $as_echo "$as_me:$LINENO: result: no" >&5
990 -$as_echo "no" >&6; }
994 -rm -rf conftest.dSYM
995 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
1000 - { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by GCC atomic builtins" >&5
1001 -$as_echo_n "checking whether pthread_t can be used by GCC atomic builtins... " >&6; }
1002 - # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
1003 - if test "$cross_compiling" = yes; then
1004 - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1005 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1006 -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
1007 -See \`config.log' for more details." >&5
1008 -$as_echo "$as_me: error: cannot run test program while cross compiling
1009 -See \`config.log' for more details." >&2;}
1010 - { (exit 1); exit 1; }; }; }
1012 - cat >conftest.$ac_ext <<_ACEOF
1015 -cat confdefs.h >>conftest.$ac_ext
1016 -cat >>conftest.$ac_ext <<_ACEOF
1017 -/* end confdefs.h. */
1019 - #include <pthread.h>
1020 - #include <string.h>
1022 - int main(int argc, char** argv) {
1027 - memset(&x1, 0x0, sizeof(x1));
1028 - memset(&x2, 0x0, sizeof(x2));
1029 - memset(&x3, 0x0, sizeof(x3));
1031 - __sync_bool_compare_and_swap(&x1, x2, x3);
1037 -rm -f conftest$ac_exeext
1038 -if { (ac_try="$ac_link"
1039 -case "(($ac_try" in
1040 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1041 - *) ac_try_echo=$ac_try;;
1043 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1044 -$as_echo "$ac_try_echo") >&5
1045 - (eval "$ac_link") 2>&5
1047 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1048 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
1049 - { (case "(($ac_try" in
1050 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1051 - *) ac_try_echo=$ac_try;;
1053 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1054 -$as_echo "$ac_try_echo") >&5
1055 - (eval "$ac_try") 2>&5
1057 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1058 - (exit $ac_status); }; }; then
1061 -cat >>confdefs.h <<\_ACEOF
1062 -#define HAVE_IB_ATOMIC_PTHREAD_T_GCC 1
1065 - { $as_echo "$as_me:$LINENO: result: yes" >&5
1066 -$as_echo "yes" >&6; }
1069 - $as_echo "$as_me: program exited with status $ac_status" >&5
1070 -$as_echo "$as_me: failed program was:" >&5
1071 -sed 's/^/| /' conftest.$ac_ext >&5
1073 -( exit $ac_status )
1075 - { $as_echo "$as_me:$LINENO: result: no" >&5
1076 -$as_echo "no" >&6; }
1080 -rm -rf conftest.dSYM
1081 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
1086 { $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5
1087 $as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; }
1088 # either define HAVE_IB_SOLARIS_ATOMICS or not
1089 @@ -48560,103 +47745,6 @@ fi
1093 - { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by Solaris libc atomic functions" >&5
1094 -$as_echo_n "checking whether pthread_t can be used by Solaris libc atomic functions... " >&6; }
1095 - # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
1096 - if test "$cross_compiling" = yes; then
1097 - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1098 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1099 -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
1100 -See \`config.log' for more details." >&5
1101 -$as_echo "$as_me: error: cannot run test program while cross compiling
1102 -See \`config.log' for more details." >&2;}
1103 - { (exit 1); exit 1; }; }; }
1105 - cat >conftest.$ac_ext <<_ACEOF
1108 -cat confdefs.h >>conftest.$ac_ext
1109 -cat >>conftest.$ac_ext <<_ACEOF
1110 -/* end confdefs.h. */
1112 - #include <pthread.h>
1113 - #include <string.h>
1115 - int main(int argc, char** argv) {
1120 - memset(&x1, 0x0, sizeof(x1));
1121 - memset(&x2, 0x0, sizeof(x2));
1122 - memset(&x3, 0x0, sizeof(x3));
1124 - if (sizeof(pthread_t) == 4) {
1126 - atomic_cas_32(&x1, x2, x3);
1128 - } else if (sizeof(pthread_t) == 8) {
1130 - atomic_cas_64(&x1, x2, x3);
1141 -rm -f conftest$ac_exeext
1142 -if { (ac_try="$ac_link"
1143 -case "(($ac_try" in
1144 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1145 - *) ac_try_echo=$ac_try;;
1147 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1148 -$as_echo "$ac_try_echo") >&5
1149 - (eval "$ac_link") 2>&5
1151 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1152 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
1153 - { (case "(($ac_try" in
1154 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1155 - *) ac_try_echo=$ac_try;;
1157 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1158 -$as_echo "$ac_try_echo") >&5
1159 - (eval "$ac_try") 2>&5
1161 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1162 - (exit $ac_status); }; }; then
1165 -cat >>confdefs.h <<\_ACEOF
1166 -#define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS 1
1169 - { $as_echo "$as_me:$LINENO: result: yes" >&5
1170 -$as_echo "yes" >&6; }
1173 - $as_echo "$as_me: program exited with status $ac_status" >&5
1174 -$as_echo "$as_me: failed program was:" >&5
1175 -sed 's/^/| /' conftest.$ac_ext >&5
1177 -( exit $ac_status )
1179 - { $as_echo "$as_me:$LINENO: result: no" >&5
1180 -$as_echo "no" >&6; }
1184 -rm -rf conftest.dSYM
1185 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
1190 # this is needed to know which one of atomic_cas_32() or atomic_cas_64()
1191 # to use in the source
1192 # The cast to long int works around a bug in the HP C Compiler
1193 @@ -49573,10 +48661,6 @@ _ACEOF
1201 # Only build client code?
1203 # Check whether --with-server was given.
1204 @@ -51544,8 +50628,6 @@ do
1205 "extra/yassl/taocrypt/test/Makefile") CONFIG_FILES="$CONFIG_FILES extra/yassl/taocrypt/test/Makefile" ;;
1206 "extra/yassl/src/Makefile") CONFIG_FILES="$CONFIG_FILES extra/yassl/src/Makefile" ;;
1207 "extra/yassl/testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES extra/yassl/testsuite/Makefile" ;;
1208 - "plugin/daemon_example/Makefile") CONFIG_FILES="$CONFIG_FILES plugin/daemon_example/Makefile" ;;
1209 - "plugin/fulltext/Makefile") CONFIG_FILES="$CONFIG_FILES plugin/fulltext/Makefile" ;;
1210 "storage/archive/Makefile") CONFIG_FILES="$CONFIG_FILES storage/archive/Makefile" ;;
1211 "storage/blackhole/Makefile") CONFIG_FILES="$CONFIG_FILES storage/blackhole/Makefile" ;;
1212 "storage/csv/Makefile") CONFIG_FILES="$CONFIG_FILES storage/csv/Makefile" ;;
1213 @@ -51557,40 +50639,40 @@ do
1214 "storage/innodb_plugin/Makefile") CONFIG_FILES="$CONFIG_FILES storage/innodb_plugin/Makefile" ;;
1215 "storage/myisam/Makefile") CONFIG_FILES="$CONFIG_FILES storage/myisam/Makefile" ;;
1216 "storage/myisammrg/Makefile") CONFIG_FILES="$CONFIG_FILES storage/myisammrg/Makefile" ;;
1217 + "storage/ndb/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/Makefile" ;;
1218 + "storage/ndb/test/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/test/Makefile" ;;
1219 + "storage/ndb/test/run-test/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/test/run-test/Makefile" ;;
1220 + "storage/ndb/test/tools/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/test/tools/Makefile" ;;
1221 + "storage/ndb/test/src/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/test/src/Makefile" ;;
1222 + "storage/ndb/test/ndbapi/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/test/ndbapi/Makefile" ;;
1223 + "storage/ndb/test/ndbapi/bank/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/test/ndbapi/bank/Makefile" ;;
1224 "storage/ndb/docs/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/docs/Makefile" ;;
1225 + "storage/ndb/tools/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/tools/Makefile" ;;
1226 "storage/ndb/include/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/include/Makefile" ;;
1227 - "storage/ndb/src/common/debugger/signaldata/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/common/debugger/signaldata/Makefile" ;;
1228 - "storage/ndb/src/common/debugger/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/common/debugger/Makefile" ;;
1229 - "storage/ndb/src/common/logger/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/common/logger/Makefile" ;;
1230 + "storage/ndb/src/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/Makefile" ;;
1231 + "storage/ndb/src/mgmsrv/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/mgmsrv/Makefile" ;;
1232 + "storage/ndb/src/cw/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/cw/Makefile" ;;
1233 + "storage/ndb/src/cw/cpcd/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/cw/cpcd/Makefile" ;;
1234 + "storage/ndb/src/mgmclient/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/mgmclient/Makefile" ;;
1235 + "storage/ndb/src/mgmapi/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/mgmapi/Makefile" ;;
1236 + "storage/ndb/src/common/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/common/Makefile" ;;
1237 "storage/ndb/src/common/mgmcommon/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/common/mgmcommon/Makefile" ;;
1238 "storage/ndb/src/common/portlib/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/common/portlib/Makefile" ;;
1239 - "storage/ndb/src/common/transporter/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/common/transporter/Makefile" ;;
1240 + "storage/ndb/src/common/debugger/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/common/debugger/Makefile" ;;
1241 + "storage/ndb/src/common/debugger/signaldata/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/common/debugger/signaldata/Makefile" ;;
1242 + "storage/ndb/src/common/logger/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/common/logger/Makefile" ;;
1243 "storage/ndb/src/common/util/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/common/util/Makefile" ;;
1244 - "storage/ndb/src/common/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/common/Makefile" ;;
1245 - "storage/ndb/src/cw/cpcd/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/cw/cpcd/Makefile" ;;
1246 - "storage/ndb/src/cw/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/cw/Makefile" ;;
1247 - "storage/ndb/src/kernel/blocks/backup/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/kernel/blocks/backup/Makefile" ;;
1248 + "storage/ndb/src/common/transporter/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/common/transporter/Makefile" ;;
1249 + "storage/ndb/src/kernel/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/kernel/Makefile" ;;
1250 + "storage/ndb/src/kernel/blocks/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/kernel/blocks/Makefile" ;;
1251 "storage/ndb/src/kernel/blocks/dbdict/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/kernel/blocks/dbdict/Makefile" ;;
1252 + "storage/ndb/src/kernel/blocks/dbtup/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/kernel/blocks/dbtup/Makefile" ;;
1253 "storage/ndb/src/kernel/blocks/dbdih/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/kernel/blocks/dbdih/Makefile" ;;
1254 "storage/ndb/src/kernel/blocks/dblqh/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/kernel/blocks/dblqh/Makefile" ;;
1255 - "storage/ndb/src/kernel/blocks/dbtup/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/kernel/blocks/dbtup/Makefile" ;;
1256 - "storage/ndb/src/kernel/blocks/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/kernel/blocks/Makefile" ;;
1257 + "storage/ndb/src/kernel/blocks/backup/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/kernel/blocks/backup/Makefile" ;;
1258 "storage/ndb/src/kernel/error/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/kernel/error/Makefile" ;;
1259 "storage/ndb/src/kernel/vm/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/kernel/vm/Makefile" ;;
1260 - "storage/ndb/src/kernel/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/kernel/Makefile" ;;
1261 - "storage/ndb/src/mgmapi/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/mgmapi/Makefile" ;;
1262 - "storage/ndb/src/mgmclient/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/mgmclient/Makefile" ;;
1263 - "storage/ndb/src/mgmsrv/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/mgmsrv/Makefile" ;;
1264 "storage/ndb/src/ndbapi/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/ndbapi/Makefile" ;;
1265 - "storage/ndb/src/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/Makefile" ;;
1266 - "storage/ndb/test/ndbapi/bank/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/test/ndbapi/bank/Makefile" ;;
1267 - "storage/ndb/test/ndbapi/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/test/ndbapi/Makefile" ;;
1268 - "storage/ndb/test/run-test/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/test/run-test/Makefile" ;;
1269 - "storage/ndb/test/src/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/test/src/Makefile" ;;
1270 - "storage/ndb/test/tools/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/test/tools/Makefile" ;;
1271 - "storage/ndb/test/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/test/Makefile" ;;
1272 - "storage/ndb/tools/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/tools/Makefile" ;;
1273 - "storage/ndb/Makefile") CONFIG_FILES="$CONFIG_FILES storage/ndb/Makefile" ;;
1274 "storage/ndb/src/libndb.ver") CONFIG_FILES="$CONFIG_FILES storage/ndb/src/libndb.ver" ;;
1275 "storage/ndb/include/ndb_version.h") CONFIG_FILES="$CONFIG_FILES storage/ndb/include/ndb_version.h" ;;
1276 "storage/ndb/include/ndb_global.h") CONFIG_FILES="$CONFIG_FILES storage/ndb/include/ndb_global.h" ;;
1279 @@ -1611,14 +1611,6 @@ case "$with_mysqld_ldflags " in
1283 -# System characteristics
1284 -case $SYSTEM_TYPE in
1287 -AC_SYS_RESTARTABLE_SYSCALLS
1291 # Build optimized or debug version ?
1292 # First check for gcc and g++
1293 if test "$GCC" = "yes"
1294 --- a/storage/innodb_plugin/plug.in
1295 +++ b/storage/innodb_plugin/plug.in
1296 @@ -53,88 +53,6 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin, [
1298 AC_SUBST(INNODB_DYNAMIC_CFLAGS)
1300 - AC_MSG_CHECKING(whether GCC atomic builtins are available)
1301 - # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
1313 - res = __sync_bool_compare_and_swap(&x, x, y);
1314 - if (!res || x != y) {
1320 - res = __sync_bool_compare_and_swap(&x, x + 1, y);
1321 - if (res || x != 10) {
1327 - res = __sync_add_and_fetch(&x, y);
1328 - if (res != 123 + 10 || x != 123 + 10) {
1333 - res = __sync_lock_test_and_set(&c, 123);
1334 - if (res != 10 || c != 123) {
1342 - AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1],
1343 - [GCC atomic builtins are available])
1344 - AC_MSG_RESULT(yes)
1351 - AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins)
1352 - # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
1355 - #include <pthread.h>
1356 - #include <string.h>
1358 - int main(int argc, char** argv) {
1363 - memset(&x1, 0x0, sizeof(x1));
1364 - memset(&x2, 0x0, sizeof(x2));
1365 - memset(&x3, 0x0, sizeof(x3));
1367 - __sync_bool_compare_and_swap(&x1, x2, x3);
1373 - AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1],
1374 - [pthread_t can be used by GCC atomic builtins])
1375 - AC_MSG_RESULT(yes)
1382 AC_MSG_CHECKING(whether Solaris libc atomic functions are available)
1383 # either define HAVE_IB_SOLARIS_ATOMICS or not
1384 AC_CHECK_FUNCS(atomic_cas_ulong \
1385 @@ -148,48 +66,6 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin, [
1389 - AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions)
1390 - # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
1393 - #include <pthread.h>
1394 - #include <string.h>
1396 - int main(int argc, char** argv) {
1401 - memset(&x1, 0x0, sizeof(x1));
1402 - memset(&x2, 0x0, sizeof(x2));
1403 - memset(&x3, 0x0, sizeof(x3));
1405 - if (sizeof(pthread_t) == 4) {
1407 - atomic_cas_32(&x1, x2, x3);
1409 - } else if (sizeof(pthread_t) == 8) {
1411 - atomic_cas_64(&x1, x2, x3);
1422 - AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], [1],
1423 - [pthread_t can be used by solaris atomics])
1424 - AC_MSG_RESULT(yes)
1431 # this is needed to know which one of atomic_cas_32() or atomic_cas_64()
1432 # to use in the source
1433 AC_CHECK_SIZEOF([pthread_t], [], [#include <pthread.h>])
1434 --- a/libmysql/Makefile.in
1435 +++ b/libmysql/Makefile.in
1436 @@ -626,7 +626,7 @@ clean-noinstPROGRAMS:
1438 conf_to_src$(EXEEXT): $(conf_to_src_OBJECTS) $(conf_to_src_DEPENDENCIES)
1439 @rm -f conf_to_src$(EXEEXT)
1440 - $(conf_to_src_LINK) $(conf_to_src_OBJECTS) $(conf_to_src_LDADD) $(LIBS)
1441 + $(conf_to_src_LINK) $(conf_to_src_OBJECTS) $(conf_to_src_LDADD)
1443 mostlyclean-compile: