diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-03-23 17:17:44 +0100 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-03-23 17:17:44 +0100 |
| commit | 14a3a61ad905d8de276a3e24005b1c30a4929916 (patch) | |
| tree | 87908179c0f07288e1edd0cf924d545c39d5bd7c /storage | |
| parent | 8503077e6d9350df98c07a45795551cf5e92a702 (diff) | |
| parent | 7dc5c00453e3ed894123c92c6264ff5abd99bdbf (diff) | |
| download | mariadb-git-14a3a61ad905d8de276a3e24005b1c30a4929916.tar.gz | |
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
mysql-test/r/ndb_single_user.result:
manual merge
mysql-test/t/disabled.def:
manual merge
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
manual merge
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/include/kernel/signaldata/DictTabInfo.hpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp b/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp index 1247e7e3480..57b4f0e7520 100644 --- a/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp +++ b/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp @@ -346,6 +346,7 @@ public: Uint32 RowGCIFlag; Uint32 RowChecksumFlag; + Uint32 SingleUserMode; Table() {} |