database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

Browse Source 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/ndb_binlog_ddl_multi.test:
  Auto merged
sql/rpl_injector.cc:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  manual merge
This commit is contained in:
unknown
2006-03-11 07:26:58 +01:00
parent a264a79eb7 9376ec6336
commit c2db8a7ffc
14 changed files with 145 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/rpl_injector.cc
View File

@ -43,6 +43,9 @@ injector::transaction::transaction(MYSQL_LOG *log, THD *thd)
injector::transaction::~transaction()
{
if (!good())
return;
/* Needed since my_free expects a 'char*' (instead of 'void*'). */
char* const the_memory= const_cast<char*>(m_start_pos.m_file_name);