bk commit into 4.1 tree (tulin:1.2454)

[tomas]

Below is the list of changes that have just been committed into a local
4.1 repository of ndbdev. When ndbdev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2454 05/09/26 10:26:38 tulin@stripped +2 -0
  added make target for printSchemaFile

  ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
    1.8 05/09/26 10:25:36 ndbdev@stripped +1 -10
    added make target for printSchemaFile

  ndb/src/kernel/blocks/dbdict/Makefile.am
    1.4 05/09/26 10:25:36 ndbdev@stripped +10 -2
    added make target for printSchemaFile

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tulin
# Host:	dl145b.mysql.com
# Root:	/home/ndbdev/tomas/mysql-4.1

--- 1.7/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp	Thu Aug 18 14:02:19 2005
+++ 1.8/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp	Mon Sep 26 10:25:36 2005
@@ -1,11 +1,3 @@
-#if 0
-make -f Makefile -f - printSchemaFile <<'_eof_'
-printSchemaFile: printSchemaFile.cpp
-	$(CXXCOMPILE) -o $@ $@.cpp -L../../../common/util/.libs -lgeneral
-_eof_
-exit $?
-#endif
-
 /* Copyright (C) 2003 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
@@ -58,8 +50,7 @@
     SchemaFile::TableEntry te = file->TableEntries[i];
     if(te.m_tableState != SchemaFile::INIT){
       ndbout << "Table " << i << ": State = " << te.m_tableState 
-	     << " version = " << table_version_major(te.m_tableVersion) <<
-	     << "(" << table_version_minor(te.m_tableVersion) << ")"
+	     << " version = " << te.m_tableVersion
              << " type = " << te.m_tableType
 	     << " noOfPages = " << te.m_noOfPages
 	     << " gcp: " << te.m_gcp << endl;

--- 1.3/ndb/src/kernel/blocks/dbdict/Makefile.am	Thu Nov 11 21:25:32 2004
+++ 1.4/ndb/src/kernel/blocks/dbdict/Makefile.am	Mon Sep 26 10:25:36 2005
@@ -1,11 +1,19 @@
-#SUBDIRS = printSchemafile
-
 noinst_LIBRARIES = libdbdict.a
+EXTRA_PROGRAMS = printSchemaFile
 
 libdbdict_a_SOURCES = Dbdict.cpp
 
+printSchemaFile_SOURCES = printSchemaFile.cpp
+
 include $(top_srcdir)/ndb/config/common.mk.am
 include $(top_srcdir)/ndb/config/type_kernel.mk.am
+
+LDADD +=  \
+         $(top_builddir)/ndb/src/common/util/libgeneral.la \
+         $(top_builddir)/ndb/src/common/portlib/libportlib.la \
+         $(top_builddir)/dbug/libdbug.a \
+         $(top_builddir)/mysys/libmysys.a \
+         $(top_builddir)/strings/libmystrings.a
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%