Commit graph

7 commits

Author SHA1 Message Date
unknown
fce978c717 ndb - post-merge fix
ndb/include/ndb_constants.h:
  post-merge fix
2005-01-27 21:23:21 +01:00
unknown
da8a9e2f20 ndb compiler warning, c++ style comment in c-file
ndb/include/ndb_constants.h:
  remove // from .h-file
2005-01-19 10:07:15 +01:00
unknown
f029af067b Merge
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndb_constants.h:
  merge 5.0->5.0-ndb
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge 5.0->5.0-ndb
ndb/include/ndbapi/NdbDictionary.hpp:
  merge 5.0->5.0-ndb
ndb/include/util/NdbSqlUtil.hpp:
  merge 5.0->5.0-ndb
ndb/src/common/util/NdbSqlUtil.cpp:
  merge 5.0->5.0-ndb
2005-01-09 00:45:06 +01:00
unknown
09a4872661 ndb - wl-1442 4.1->5.0 merge fixes
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 4.1->5.0 merge fixes
ndb/include/ndb_constants.h:
  wl-1442 4.1->5.0 merge fixes
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 4.1->5.0 merge fixes
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 4.1->5.0 merge fixes
2005-01-08 23:24:25 +01:00
unknown
39aa7b102c ndb_constants.h:
wl-1442 comment for 4.1->5.0


ndb/include/ndb_constants.h:
  wl-1442 comment for 4.1->5.0
2005-01-08 19:37:50 +01:00
unknown
2331344909 ndb - wl-1442 new varchar
mysql-test/r/ndb_alter_table.result:
  wl-1442 new varchar
mysql-test/r/ndb_bitfield.result:
  wl-1442 new varchar
mysql-test/r/ndb_charset.result:
  wl-1442 new varchar
mysql-test/t/ndb_charset.test:
  wl-1442 new varchar
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 new varchar
ndb/include/ndb_constants.h:
  wl-1442 new varchar
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 new varchar
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 new varchar
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbOperationDefine.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbOperationSearch.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbRecAttr.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbTransaction.cpp:
  wl-1442 new varchar
ndb/test/ndbapi/testOIBasic.cpp:
  wl-1442 new varchar
sql/ha_ndbcluster.cc:
  wl-1442 new varchar
2005-01-07 11:55:20 +01:00
unknown
07ed380523 ndb: wl-1442 mysql vs ndb datatypes: prepare
ndb/include/Makefile.am:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/include/kernel/AttributeDescriptor.hpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/include/ndb_constants.h:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/include/ndb_types.h:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/include/ndbapi/NdbDictionary.hpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/include/util/NdbSqlUtil.hpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/kernel/vm/MetaData.hpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/ndbapi/Ndb.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/ndbapi/NdbScanOperation.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
2004-12-26 22:40:42 +01:00