bzr push into mysql-5.1-telco-7.1 branch (ole.john.aske:4621 to 4622)

[Ole John Aske]

 4622 Ole John Aske	2012-10-04 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/src/kernel/error/ErrorReporter.cpp
 4621 Ole John Aske	2012-10-04 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/test/ndbapi/testSpj.cpp
=== modified file 'storage/ndb/src/kernel/error/ErrorReporter.cpp'
--- a/storage/ndb/src/kernel/error/ErrorReporter.cpp	2012-01-19 06:21:05 +0000
+++ b/storage/ndb/src/kernel/error/ErrorReporter.cpp	2012-10-04 07:27:22 +0000
@@ -49,6 +49,9 @@ static
 const char *
 ndb_basename(const char * path)
 {
+  if (path == NULL)
+    return NULL;
+
   const char separator = '/';
   const char * p = path + strlen(path);
   while (p > path && p[0] != separator)

No bundle (reason: useless for push emails).