9 files changed, 21 insertions, 20 deletions
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index 50e0f04eb14..50e0f04eb14 100755..100644
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
diff --git a/extra/Makefile.am b/extra/Makefile.am
index 0de513ba15a..de8e519e641 100644
--- a/extra/Makefile.am
+++ b/extra/Makefile.am
@@ -15,7 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
-			@ndbcluster_includes@ -I$(top_srcdir)/sql
+			-I$(top_srcdir)/sql
 LDADD =			@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
 			../dbug/libdbug.a ../strings/libmystrings.a
 BUILT_SOURCES=		$(top_builddir)/include/mysqld_error.h \
@@ -23,10 +23,7 @@ BUILT_SOURCES=		$(top_builddir)/include/mysqld_error.h \
                         $(top_builddir)/include/mysqld_ername.h
 pkginclude_HEADERS=	$(BUILT_SOURCES)
 CLEANFILES =		$(BUILT_SOURCES)
-# We never use SUBDIRS here, but needed for automake 1.6.3
-# to generate code to handle DIST_SUBDIRS
-SUBDIRS=
-DIST_SUBDIRS=           yassl
+SUBDIRS =		@yassl_dir@
 
 # This will build mysqld_error.h and sql_state.h
 $(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)
@@ -43,7 +40,10 @@ $(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h
 bin_PROGRAMS =		replace comp_err perror resolveip my_print_defaults \
 			resolve_stack_dump mysql_waitpid innochecksum
 noinst_PROGRAMS =	charset2html
-EXTRA_DIST =	CMakeLists.txt
+EXTRA_DIST =		CMakeLists.txt
+
+perror.o: perror.c 
+	$(COMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff --git a/extra/comp_err.c b/extra/comp_err.c
index 14774c87a28..0a77cf6f66d 100644
--- a/extra/comp_err.c
+++ b/extra/comp_err.c
@@ -188,9 +188,9 @@ int main(int argc, char *argv[])
       DBUG_RETURN(1);
     }
     clean_up(lang_head, error_head);
-	DBUG_LEAVE; /* we can't call my_end after DBUG_RETURN */
+    DBUG_LEAVE;			/* Can't use dbug after my_end() */
     my_end(info_flag ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);
-    return(0);
+    return 0;
   }
 }
 
@@ -639,7 +639,7 @@ static char *get_word(char **str)
   DBUG_ENTER("get_word");
 
   *str= find_end_of_word(start);
-  DBUG_RETURN(my_strdup_with_length(start, (uint) (*str - start),
+  DBUG_RETURN(my_strndup(start, (uint) (*str - start),
 				    MYF(MY_WME | MY_FAE)));
 }
 
@@ -673,7 +673,7 @@ static struct message *parse_message_string(struct message *new_message,
   while (*str != ' ' && *str != '\t' && *str)
     str++;
   if (!(new_message->lang_short_name=
-	my_strdup_with_length(start, (uint) (str - start),
+	my_strndup(start, (uint) (str - start),
 			      MYF(MY_WME | MY_FAE))))
     DBUG_RETURN(0);				/* Fatal error */
   DBUG_PRINT("info", ("msg_slang: %s", new_message->lang_short_name));
@@ -693,7 +693,7 @@ static struct message *parse_message_string(struct message *new_message,
   start= str + 1;
   str= parse_text_line(start);
 
-  if (!(new_message->text= my_strdup_with_length(start, (uint) (str - start),
+  if (!(new_message->text= my_strndup(start, (uint) (str - start),
 						 MYF(MY_WME | MY_FAE))))
     DBUG_RETURN(0);				/* Fatal error */
   DBUG_PRINT("info", ("msg_text: %s", new_message->text));
diff --git a/extra/perror.c b/extra/perror.c
index b26e516a101..d4eae3e471d 100644
--- a/extra/perror.c
+++ b/extra/perror.c
@@ -23,14 +23,14 @@
 #include <m_string.h>
 #include <errno.h>
 #include <my_getopt.h>
-#ifdef HAVE_NDBCLUSTER_DB
-#include "../ndb/src/ndbapi/ndberror.c"
-#include "../ndb/src/kernel/error/ndbd_exit_codes.c"
+#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
+#include "../storage/ndb/src/ndbapi/ndberror.c"
+#include "../storage/ndb/src/kernel/error/ndbd_exit_codes.c"
 #endif
 
 static my_bool verbose, print_all_codes;
 
-#ifdef HAVE_NDBCLUSTER_DB
+#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
 static my_bool ndb_code;
 static char ndb_string[1024];
 #endif
@@ -41,7 +41,7 @@ static struct my_option my_long_options[] =
    NO_ARG, 0, 0, 0, 0, 0, 0},
   {"info", 'I', "Synonym for --help.",  0, 0, 0, GET_NO_ARG,
    NO_ARG, 0, 0, 0, 0, 0, 0},
-#ifdef HAVE_NDBCLUSTER_DB
+#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
   {"ndb", 257, "Ndbcluster storage engine specific error codes.",  (gptr*) &ndb_code,
    (gptr*) &ndb_code, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 #endif
@@ -236,7 +236,7 @@ int main(int argc,char *argv[])
 
       found=0;
       code=atoi(*argv);
-#ifdef HAVE_NDBCLUSTER_DB
+#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
       if (ndb_code)
       {
 	if ((ndb_error_string(code, ndb_string, sizeof(ndb_string)) < 0) &&
diff --git a/extra/resolveip.c b/extra/resolveip.c
index f8cff2a976c..eb05886d5b1 100644
--- a/extra/resolveip.c
+++ b/extra/resolveip.c
@@ -32,7 +32,7 @@
 #include <my_net.h>
 #include <my_getopt.h>
 
-#if !defined(_AIX) && !defined(HAVE_UNIXWARE7_THREADS) && !defined(HAVE_UNIXWARE7_POSIX) && !defined(h_errno)
+#if !defined(_AIX) && !defined(h_errno)
 extern int h_errno;
 #endif
 
diff --git a/extra/yassl/CMakeLists.txt b/extra/yassl/CMakeLists.txt
index e5429876072..e5429876072 100755..100644
--- a/extra/yassl/CMakeLists.txt
+++ b/extra/yassl/CMakeLists.txt
diff --git a/extra/yassl/Makefile.am b/extra/yassl/Makefile.am
index 12a7da1085b..e4a81019cd1 100644
--- a/extra/yassl/Makefile.am
+++ b/extra/yassl/Makefile.am
@@ -1,2 +1,3 @@
 SUBDIRS = taocrypt src testsuite
-EXTRA_DIST = yassl.dsp yassl.dsw $(wildcard mySTL/*.hpp) CMakeLists.txt
+EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj $(wildcard mySTL/*.hpp) \
+	     CMakeLists.txt
diff --git a/extra/yassl/taocrypt/CMakeLists.txt b/extra/yassl/taocrypt/CMakeLists.txt
index 0af0a242e5d..0af0a242e5d 100755..100644
--- a/extra/yassl/taocrypt/CMakeLists.txt
+++ b/extra/yassl/taocrypt/CMakeLists.txt
diff --git a/extra/yassl/taocrypt/Makefile.am b/extra/yassl/taocrypt/Makefile.am
index e232b499cc7..c242696b82f 100644
--- a/extra/yassl/taocrypt/Makefile.am
+++ b/extra/yassl/taocrypt/Makefile.am
@@ -1,2 +1,2 @@
 SUBDIRS = src test benchmark
-EXTRA_DIST = taocrypt.dsw taocrypt.dsp CMakeLists.txt
+EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj CMakeLists.txt