diff options
author | unknown <tomas@poseidon.> | 2006-12-27 11:01:54 +0100 |
---|---|---|
committer | unknown <tomas@poseidon.> | 2006-12-27 11:01:54 +0100 |
commit | e5dd5e063a2b291b0169e1efb3be05dcaef36fc7 (patch) | |
tree | 694a692ab769c1326162c8eb2bebed6dd273cd52 /storage/ndb/include/kernel/signaldata | |
parent | fcbfb41f30d794a14241070a44bba841ea0417d7 (diff) | |
parent | b2f62764c6257c166d6b5f84b0cd39a3aefcca16 (diff) | |
download | mariadb-git-e5dd5e063a2b291b0169e1efb3be05dcaef36fc7.tar.gz |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into poseidon.:/home/tomas/mysql-5.1-new-ndb
include/my_base.h:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/r/ndb_dd_ddl.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/include/kernel/signaldata/BackupContinueB.hpp:
Auto merged
storage/ndb/src/common/util/File.cpp:
Auto merged
storage/ndb/src/common/util/InputStream.cpp:
Auto merged
storage/ndb/src/common/util/socket_io.cpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
sql/sql_plugin.cc:
manual merge
Diffstat (limited to 'storage/ndb/include/kernel/signaldata')
-rw-r--r-- | storage/ndb/include/kernel/signaldata/BackupContinueB.hpp | 3 | ||||
-rw-r--r-- | storage/ndb/include/kernel/signaldata/Extent.hpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/storage/ndb/include/kernel/signaldata/BackupContinueB.hpp b/storage/ndb/include/kernel/signaldata/BackupContinueB.hpp index ff0e90d1fbd..d96173d6807 100644 --- a/storage/ndb/include/kernel/signaldata/BackupContinueB.hpp +++ b/storage/ndb/include/kernel/signaldata/BackupContinueB.hpp @@ -32,7 +32,8 @@ private: BUFFER_FULL_FRAG_COMPLETE = 3, BUFFER_FULL_META = 4, BACKUP_FRAGMENT_INFO = 5, - RESET_DISK_SPEED_COUNTER = 6 + RESET_DISK_SPEED_COUNTER = 6, + ZDELAY_SCAN_NEXT = 7 }; }; diff --git a/storage/ndb/include/kernel/signaldata/Extent.hpp b/storage/ndb/include/kernel/signaldata/Extent.hpp index 86f45163be5..ea31b0968aa 100644 --- a/storage/ndb/include/kernel/signaldata/Extent.hpp +++ b/storage/ndb/include/kernel/signaldata/Extent.hpp @@ -74,6 +74,8 @@ struct FreeExtentReq { Local_key key; Uint32 table_id; Uint32 tablespace_id; + Uint32 lsn_hi; + Uint32 lsn_lo; } request; struct { |