mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 11:57:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Manual merge 5.0->5.1

Browse source 
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/innobase/include/lock0lock.h:
  Auto merged
storage/innobase/include/srv0srv.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/srv/srv0srv.c:
  Auto merged
storage/ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
sql/slave.cc:
  Due to refactoring, this needs to be checked before the call.
sql/sql_acl.cc:
  Resolving conflicts due to bug fix and filter refactoring
This commit is contained in:
unknown 2005-05-06 15:04:07 +02:00
commit 5bb9169118
122 changed files with 3099 additions and 1457 deletions
Download patch file Download diff file Expand all files Collapse all files

8
storage/ndb/test/src/NDBT_ResultRow.cpp
View file

@ -116,8 +116,12 @@ BaseString NDBT_ResultRow::c_str() const {
NdbOut &
operator << (NdbOut& ndbout, const NDBT_ResultRow & res) {
for(int i = 0; i<res.cols; i++)
ndbout << *(res.data[i]) << "\t";
if (res.cols != 0)
{
ndbout << *(res.data[0]);
for(int i = 1; i<res.cols; i++)
ndbout << res.ad << *(res.data[i]);
}
return ndbout;
}