diff options
author | unknown <pekka@mysql.com> | 2005-03-28 11:52:16 +0200 |
---|---|---|
committer | unknown <pekka@mysql.com> | 2005-03-28 11:52:16 +0200 |
commit | 0e13f97e3a2511afc962aa0f555549567a8ad906 (patch) | |
tree | 36708e306fafa16675cb132a120e26a2e52b147f | |
parent | 1bb9a7944bd836f516eccb5df1202840081ba5f3 (diff) | |
parent | e674f4594fd2a29101bb357aaeadb4174f5c48e9 (diff) | |
download | mariadb-git-0e13f97e3a2511afc962aa0f555549567a8ad906.tar.gz |
Merge mysql.com:/export/space/pekka/ndb/version/my41
into mysql.com:/export/space/pekka/ndb/version/my50
-rw-r--r-- | ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp (renamed from ndb/src/kernel/blocks/dbdict/printSchemafile/printSchemafile.cpp) | 15 | ||||
-rw-r--r-- | ndb/src/kernel/blocks/dbdict/printSchemafile/Makefile | 12 |
2 files changed, 15 insertions, 12 deletions
diff --git a/ndb/src/kernel/blocks/dbdict/printSchemafile/printSchemafile.cpp b/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp index bf721a0b30a..0ba52878b7c 100644 --- a/ndb/src/kernel/blocks/dbdict/printSchemafile/printSchemafile.cpp +++ b/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp @@ -1,3 +1,11 @@ +#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 @@ -92,6 +100,13 @@ NDB_COMMAND(printSchemafile, } print(filename, (SchemaFile *)&buf[0]); + + Uint32 chk = 0, i; + for (i = 0; i < bytes/4; i++) + chk ^= buf[i]; + if (chk != 0) + ndbout << "Invalid checksum!" << endl; + delete [] buf; return 0; } diff --git a/ndb/src/kernel/blocks/dbdict/printSchemafile/Makefile b/ndb/src/kernel/blocks/dbdict/printSchemafile/Makefile deleted file mode 100644 index 1b097e2ce37..00000000000 --- a/ndb/src/kernel/blocks/dbdict/printSchemafile/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -include .defs.mk - -TYPE := ndbapi - -BIN_TARGET := printSchemafile -BIN_TARGET_ARCHIVES := portlib general - -CCFLAGS_LOC += -I.. - -SOURCES := printSchemafile.cpp - -include $(NDB_TOP)/Epilogue.mk |