1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from 5.0-bugteam

Browse Source
This commit is contained in:
Staale Smedseng 2009-04-16 11:47:21 +02:00
commit 3bea588ca1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-line-utils/libedit/term.c
View File

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

4
storage/ndb/tools/restore/consumer_restore.cpp
View File

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

4
storage/ndb/tools/restore/consumer_restorem.cpp
View File

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