diff options
| author | unknown <anozdrin/alik@quad.opbmk> | 2008-03-18 13:51:17 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@quad.opbmk> | 2008-03-18 13:51:17 +0300 |
| commit | 07db330a55e54e59490b9e46faeade789a52d835 (patch) | |
| tree | e96aaaaa6d8f3413c11e63aee2802003dfc5b2bc /storage/ndb | |
| parent | 269ebe54211cf96c4e64fa7268a1414588ca1de8 (diff) | |
| parent | 809522598a9a8946a5e1fa4a981717c38466a379 (diff) | |
| download | mariadb-git-07db330a55e54e59490b9e46faeade789a52d835.tar.gz | |
Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1
into quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
libmysql/libmysql.c:
Auto merged
sql-common/client.c:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'storage/ndb')
| -rw-r--r-- | storage/ndb/src/kernel/blocks/tsman.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/ndb/src/kernel/blocks/tsman.cpp b/storage/ndb/src/kernel/blocks/tsman.cpp index 8e68e118f98..ce5797cf209 100644 --- a/storage/ndb/src/kernel/blocks/tsman.cpp +++ b/storage/ndb/src/kernel/blocks/tsman.cpp @@ -181,7 +181,6 @@ struct TsmanChunk Vector<Uint32> bitmask; }; template class Vector<TsmanChunk>; -template class Vector<Uint32>; #endif void |