Merge mysql.com:/home/jonas/src/wl1744

into mysql.com:/home/jonas/src/fix

configure.in

@@ -3147,6 +3147,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
  support-files/MacOSX/Makefile mysql-test/Makefile dnl
  netware/Makefile dnl
  include/mysql_version.h dnl
+ ndb/include/ndb_version.h dnl
  cmd-line-utils/Makefile dnl
  cmd-line-utils/libedit/Makefile dnl
  zlib/Makefile dnl

ndb/Makefile.am

@@ -22,3 +22,6 @@ windoze:
 	for i in `find . -name 'Makefile.am'`; do make -C `dirname $$i` windoze-dsp; done
 
 windoze-dsp:
+
+all-windoze-dsp: windoze
+	tar cvfz ndb-win-dsp.tar.gz `find . -name '*.dsp'`

ndb/include/ndb_version.h.in

+/* Copyright (C) 2003 MySQL AB
+
+   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; either version 2 of the License, or
+   (at your option) any later version.
+
+   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 */
+
+#ifndef NDB_VERSION_H
+#define NDB_VERSION_H
+
+#include <ndb_global.h>
+#include <version.h>
+
+/* NDB build version */
+#define NDB_VERSION_BUILD @NDB_VERSION_BUILD@
+
+/* NDB major version */
+#define NDB_VERSION_MAJOR @NDB_VERSION_MAJOR@
+
+/* NDB minor version */
+#define NDB_VERSION_MINOR @NDB_VERSION_MINOR@
+
+/* NDB status version */
+#define NDB_VERSION_STATUS "@NDB_VERSION_STATUS@"
+
+
+#define MAKE_VERSION(A,B,C) (((A) << 16) | ((B) << 8)  | ((C) << 0))
+
+#define NDB_VERSION_D MAKE_VERSION(NDB_VERSION_MAJOR, NDB_VERSION_MINOR, NDB_VERSION_BUILD)
+
+#define NDB_VERSION_STRING (getVersionString(NDB_VERSION, NDB_VERSION_STATUS))
+
+#define NDB_VERSION ndbGetOwnVersion()
+
+/**
+ * Version id 
+ *
+ *  Used by transporter and when communicating with
+ *     managment server
+ */
+/*#define NDB_VERSION_ID 0*/
+
+#endif
+