diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2009-04-16 11:47:21 +0200 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-04-16 11:47:21 +0200 |
| commit | 3bea588ca1450f80d42da7b845073cbc7e677d31 (patch) | |
| tree | 819b0e4175769ea12f424efbcee2ec2baf912a39 | |
| parent | c90a869c6b5a2ec80e6e917a862872b0d3a40a54 (diff) | |
| parent | 9301da563fa9643648413aedc2eadce72097d317 (diff) | |
| download | mariadb-git-3bea588ca1450f80d42da7b845073cbc7e677d31.tar.gz | |
Merge from 5.0-bugteam
| -rw-r--r-- | cmd-line-utils/libedit/term.c | 2 | ||||
| -rw-r--r-- | storage/ndb/tools/restore/consumer_restore.cpp | 4 | ||||
| -rw-r--r-- | storage/ndb/tools/restore/consumer_restorem.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cmd-line-utils/libedit/term.c b/cmd-line-utils/libedit/term.c index 488c760da14..2f1aefa7117 100644 --- a/cmd-line-utils/libedit/term.c +++ b/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 diff --git a/storage/ndb/tools/restore/consumer_restore.cpp b/storage/ndb/tools/restore/consumer_restore.cpp index 89f680a80e4..e8e8d584f09 100644 --- a/storage/ndb/tools/restore/consumer_restore.cpp +++ b/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 diff --git a/storage/ndb/tools/restore/consumer_restorem.cpp b/storage/ndb/tools/restore/consumer_restorem.cpp index 946012ee98e..233f8d5fe98 100644 --- a/storage/ndb/tools/restore/consumer_restorem.cpp +++ b/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 |