Apply patch by Antony Dovgal:

- Move SAFE_MUTEX to be stored in config.h by configure.in (not as a flag used with compiler command line)
- Generate my_config.h in configure

BUILD/SETUP.sh:
  Remove -DSAFE_MUTEX as the following --with-debug flag will automaticly add it
BUILD/compile-ia64-debug-max:
  Remove -DSAFE_MUTEX as the following --with-debug flag will automaticly add it
configure.in:
  Move SAFE_MUTEX and SAFE_MALLOC to [my_] config.h
  Generate my_config.h as part of configure process
dbug/dbug.c:
  Include my_global.h before we undef SAFE_MUTEX
include/Makefile.am:
  Update comment. For now, lets generate my_config.h if someone deletes it after configure
mysys/my_wincond.c:
  Include my_global.h before we undef SAFE_MUTEX
mysys/my_winthread.c:
  Include my_global.h before we undef SAFE_MUTEX

1 files changed, 2 insertions, 0 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 6ace3b6acf8..516fdeee392 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -59,6 +59,8 @@ link_sources:
 # We want both "my_config.h" and "config.h" that are identical, as
 # MySQL sources assumes the name "my_config.h", and 3rd party sources
 # assumes the name "config.h".
+# Normally this is generated by configure; This rule is left here in case
+# someone deletes my_config.h and expect it to be generated by make
 my_config.h: config.h
 	$(CP) config.h my_config.h