diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-06-11 12:07:59 +0200 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-06-11 12:07:59 +0200 |
| commit | a22c8c5be5ceadd23eed707ae2f1308ced2de977 (patch) | |
| tree | 796cc97d1d103e18e0672d9b57dee4c54857073c /storage/ndb | |
| parent | 510835a0727fc1ebe98e2808cae91c8ab014d27e (diff) | |
| parent | 585cf08fe6a8d6e237732daa94a969f93e5c84ec (diff) | |
| download | mariadb-git-a22c8c5be5ceadd23eed707ae2f1308ced2de977.tar.gz | |
Merge MySQL 5.1.35 into MySQL 5.4
Diffstat (limited to 'storage/ndb')
| -rw-r--r-- | storage/ndb/tools/restore/consumer_restore.cpp | 4 | ||||
| -rw-r--r-- | storage/ndb/tools/restore/consumer_restorem.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
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 |