mariadb/storage/ndb/include
unknown 36aeee3682 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupSignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NodeFailRep.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/ndbapi/Makefile.am:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/src/NdbBackup.cpp:
  Auto merged
2005-09-09 15:26:47 +02:00
..
debugger Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 2005-05-02 13:19:50 +02:00
editline Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
kernel Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-09-09 15:26:47 +02:00
logger Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
mgmapi Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
mgmcommon Merge 2005-07-12 20:01:22 +02:00
ndbapi Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04:00
newtonapi Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
portlib Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04:00
transporter Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-22 14:50:19 +02:00
util Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-09-06 09:21:23 +02:00
Makefile.am All changes for change to all storage engines being under storage directory. 2005-04-26 19:04:36 -07:00
ndb_constants.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndb_global.h.in Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndb_init.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndb_net.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndb_types.h.in Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndb_version.h.in Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 2005-07-15 15:08:38 +02:00