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

Manual merge from mysql-trunk-merge.

Browse Source 
Conflicts:
  - storage/archive/ha_archive.cc
This commit is contained in:
Alexander Nozdrin 2010-01-28 01:13:10 +03:00
commit a2259d8487
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/archive/ha_archive.cc
View File

@ -1555,7 +1555,7 @@ int ha_archive::info(uint flag)
stats.data_file_length= file_stat.st_size;
stats.index_file_length=0;
stats.mean_rec_length= stats.records ?
stats.data_file_length / stats.records : table->s->reclength;
ulong(stats.data_file_length / stats.records) : table->s->reclength;
}
}

8
storage/ndb/include/ndbapi/NdbEventOperation.hpp
View File

@ -178,22 +178,22 @@ public:
/**
* Check if table name has changed, for event TE_ALTER
*/
const bool tableNameChanged() const;
bool tableNameChanged() const;
/**
* Check if table frm has changed, for event TE_ALTER
*/
const bool tableFrmChanged() const;
bool tableFrmChanged() const;
/**
* Check if table fragmentation has changed, for event TE_ALTER
*/
const bool tableFragmentationChanged() const;
bool tableFragmentationChanged() const;
/**
* Check if table range partition list name has changed, for event TE_ALTER
*/
const bool tableRangeListChanged() const;
bool tableRangeListChanged() const;
/**
* Retrieve the GCI of the latest retrieved event

4
storage/ndb/include/ndbapi/NdbOperation.hpp
View File

@ -779,7 +779,7 @@ public:
/**
* Get the type of access for this operation
*/
const Type getType() const;
Type getType() const;
/** @} *********************************************************************/
@ -1135,7 +1135,7 @@ Return Value Return the Type.
Remark: Gets type of access.
******************************************************************************/
inline
const NdbOperation::Type
NdbOperation::Type
NdbOperation::getType() const
{
return m_type;

8
storage/ndb/src/ndbapi/NdbEventOperation.cpp
View File

@ -96,22 +96,22 @@ NdbEventOperation::hasError() const
return m_impl.m_has_error;
}
const bool NdbEventOperation::tableNameChanged() const
bool NdbEventOperation::tableNameChanged() const
{
return m_impl.tableNameChanged();
}
const bool NdbEventOperation::tableFrmChanged() const
bool NdbEventOperation::tableFrmChanged() const
{
return m_impl.tableFrmChanged();
}
const bool NdbEventOperation::tableFragmentationChanged() const
bool NdbEventOperation::tableFragmentationChanged() const
{
return m_impl.tableFragmentationChanged();
}
const bool NdbEventOperation::tableRangeListChanged() const
bool NdbEventOperation::tableRangeListChanged() const
{
return m_impl.tableRangeListChanged();
}

8
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
View File

@ -658,22 +658,22 @@ NdbEventOperationImpl::stop()
DBUG_RETURN(r);
}
const bool NdbEventOperationImpl::tableNameChanged() const
bool NdbEventOperationImpl::tableNameChanged() const
{
return (bool)AlterTableReq::getNameFlag(m_change_mask);
}
const bool NdbEventOperationImpl::tableFrmChanged() const
bool NdbEventOperationImpl::tableFrmChanged() const
{
return (bool)AlterTableReq::getFrmFlag(m_change_mask);
}
const bool NdbEventOperationImpl::tableFragmentationChanged() const
bool NdbEventOperationImpl::tableFragmentationChanged() const
{
return (bool)AlterTableReq::getFragDataFlag(m_change_mask);
}
const bool NdbEventOperationImpl::tableRangeListChanged() const
bool NdbEventOperationImpl::tableRangeListChanged() const
{
return (bool)AlterTableReq::getRangeListFlag(m_change_mask);
}

8
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
View File

@ -361,10 +361,10 @@ public:
NdbBlob *getBlobHandle(const NdbColumnImpl *, int n);
int readBlobParts(char* buf, NdbBlob* blob, Uint32 part, Uint32 count);
int receive_event();
const bool tableNameChanged() const;
const bool tableFrmChanged() const;
const bool tableFragmentationChanged() const;
const bool tableRangeListChanged() const;
bool tableNameChanged() const;
bool tableFrmChanged() const;
bool tableFragmentationChanged() const;
bool tableRangeListChanged() const;
Uint64 getGCI();
Uint32 getAnyValue() const;
Uint64 getLatestGCI();