database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity
Files
b436ae59d5d7dc753f01e711a49bb605882cceca
mariadb/storage/ndb/include/ndbapi
History
unknown b436ae59d5 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


mysql-test/r/ndb_insert.result:
  Auto merged
mysql-test/r/ndb_replace.result:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Keeping local and do manual merge
sql/ha_ndbcluster.h:
  Keeping local and do hand merge
2006-03-23 22:39:30 +01:00
..
ndb_cluster_connection.hpp
manual merge
2006-02-13 14:25:31 +01:00
ndb_opt_defaults.h
Changes to create storage directory for storage engines.
2005-04-26 18:19:54 -07:00
Ndb.hpp
ndb - rbr blobs etc: set db/schema in injector_ndb before calling NDB
2006-02-20 12:07:12 +01:00
ndbapi_limits.h
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-05-20 06:25:02 +02:00
NdbApi.hpp
Changes to create storage directory for storage engines.
2005-04-26 18:19:54 -07:00
NdbBlob.hpp
ndb - bug#18067 bug#18075 closes these bugs
2006-03-09 17:16:04 +01:00
NdbDictionary.hpp
ndb - bug#17813 schema.query => blob
2006-03-23 04:59:14 +01:00
ndberror.h
wl2325 wl2324
2006-01-12 19:51:02 +01:00
NdbError.hpp
wl2325 wl2324
2006-01-12 19:51:02 +01:00
NdbEventOperation.hpp
NdbEventOperationImpl.cpp, NdbEventOperation.cpp, NdbEventOperation.hpp:
2006-02-08 09:58:47 +01:00
NdbIndexOperation.hpp
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2006-03-23 22:39:30 +01:00
NdbIndexScanOperation.hpp
Import ndb varsize
2005-11-07 12:19:28 +01:00
NdbIndexStat.hpp
NdbIndexStat.cpp, NdbIndexStat.hpp, Suma.hpp portability changes from pekka
2005-11-06 14:12:14 +01:00
NdbOperation.hpp
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2006-03-23 22:39:30 +01:00
NdbPool.hpp
Changes to create storage directory for storage engines.
2005-04-26 18:19:54 -07:00
NdbRecAttr.hpp
Import ndb varsize
2005-11-07 12:19:28 +01:00
NdbReceiver.hpp
Changes to create storage directory for storage engines.
2005-04-26 18:19:54 -07:00
NdbScanFilter.hpp
Changes to create storage directory for storage engines.
2005-04-26 18:19:54 -07:00
NdbScanOperation.hpp
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2006-03-23 22:39:30 +01:00
NdbTransaction.hpp
ndb: removed TransporterFacade singleton
2006-03-22 17:28:45 +01:00