5.0 to 5.1 merge

mysql-test/r/grant.result:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
configure.in:
  merge of 5.0 to 5.1, version info and NDB_VERSION_() conflicts
libmysqld/Makefile.am:
  merge of Makefile sql_sources list
sql/sql_acl.h:
  merge, no need to hand resolve
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

3 files changed, 18 insertions, 13 deletions

diff --git a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
index 78209c3affa..4bc5b127a8f 100644
--- a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+++ b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
@@ -2470,7 +2470,9 @@ Dbdict::restartCreateTab_writeTableConf(Signal* signal,
   callback.m_callbackFunction = 
     safe_cast(&Dbdict::restartCreateTab_dihComplete);
   
-  SegmentedSectionPtr fragDataPtr; fragDataPtr.setNull();
+  SegmentedSectionPtr fragDataPtr; 
+  fragDataPtr.sz = 0;
+  fragDataPtr.setNull();
   createTab_dih(signal, createTabPtr, fragDataPtr, &callback);
 }
 
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