Merge from 5.0-bugteam

cmd-line-utils/libedit/term.c

@@ -61,7 +61,7 @@ static char sccsid[] = "@(#)term.c	8.2 (Berkeley) 4/30/95";
 #ifdef HAVE_NCURSES_H
 #include <ncurses.h>
 #endif
-/* Solaris's term.h does horrid things. */
+/* Don't use Solaris's term.h. */
 #if (defined(HAVE_TERM_H) && !defined(__SunOS))
 #include <term.h>
 #endif

storage/ndb/tools/restore/consumer_restore.cpp

@@ -1375,7 +1375,7 @@ BackupRestore::logEntry(const LogEntry & tup)
   NdbTransaction * trans = m_ndb->startTransaction();
   if (trans == NULL) 
   {
-    // Deep shit, TODO: handle the error
+    // TODO: handle the error
     err << "Cannot start transaction" << endl;
     exitHandler();
   } // if
@@ -1524,7 +1524,7 @@ BackupRestore::tuple(const TupleS & tup)
     NdbTransaction * trans = m_ndb->startTransaction();
     if (trans == NULL) 
     {
-      // Deep shit, TODO: handle the error
+      // TODO: handle the error
       ndbout << "Cannot start transaction" << endl;
       exitHandler();
     } // if

storage/ndb/tools/restore/consumer_restorem.cpp

@@ -374,7 +374,7 @@ BackupRestore::tuple(const TupleS & tup)
     NdbTransaction * trans = m_ndb->startTransaction();
     if (trans == NULL) 
     {
-      // Deep shit, TODO: handle the error
+      // TODO: handle the error
       ndbout << "Cannot start transaction" << endl;
       exit(-1);
     } // if
@@ -463,7 +463,7 @@ BackupRestore::logEntry(const LogEntry & tup)
   NdbTransaction * trans = m_ndb->startTransaction();
   if (trans == NULL) 
   {
-    // Deep shit, TODO: handle the error
+    // TODO: handle the error
     ndbout << "Cannot start transaction" << endl;
     exit(-1);
   } // if