database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb

Browse Source 
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
This commit is contained in:
unknown
2007-12-11 16:08:52 +01:00
parent 577c13a59c 8e6e313c36
commit aadf1f1ce3
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/ndb/t/disabled.def
View File

@ -12,7 +12,6 @@
partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
ndb_partition_error2 : HF is not sure if the test can work as internded on all the platforms ndb_partition_error2 : HF is not sure if the test can work as internded on all the platforms
ndb_binlog_basic : Bug #32759 2007-11-27 mats ndb_binlog_basic assert failure 'thd->transaction.stmt.modified_non_trans_table'
# the below testcase have been reworked to avoid the bug, test contains comment, keep bug open # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
#ndb_binlog_ddl_multi : BUG#18976 2006-04-10 kent CRBR: multiple binlog, second binlog may miss schema log events #ndb_binlog_ddl_multi : BUG#18976 2006-04-10 kent CRBR: multiple binlog, second binlog may miss schema log events

1
storage/ndb/src/mgmsrv/MgmtSrvr.cpp
View File

@ -3010,7 +3010,6 @@ int MgmtSrvr::connect_to_self(void)
return 0; return 0;
} }
template class Vector<unsigned short>;
template class MutexVector<unsigned short>; template class MutexVector<unsigned short>;
template class MutexVector<Ndb_mgmd_event_service::Event_listener>; template class MutexVector<Ndb_mgmd_event_service::Event_listener>;
template class Vector<EventSubscribeReq>; template class Vector<EventSubscribeReq>;

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

@ -792,6 +792,18 @@ NdbEventOperationImpl::receive_event()
p = p->next(); p = p->next();
} }
} }
// change the blobHandle's to refer to the new table object.
NdbBlob *p = theBlobList;
while (p)
{
int no = p->getColumn()->getColumnNo();
NdbColumnImpl *tAttrInfo = at->getColumn(no);
DBUG_PRINT("info", ("blob_handle: 0x%lx "
"switching column impl 0x%lx -> 0x%lx",
(long) p, (long) p->theColumn, (long) tAttrInfo));
p->theColumn = tAttrInfo;
p = p->next();
}
if (tmp_table_impl) if (tmp_table_impl)
delete tmp_table_impl; delete tmp_table_impl;
} }