mariadb/storage/ndb/include
unknown 2a2f219c02 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


configure.in:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/ndb/include/util/OutputStream.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
2006-12-01 21:12:13 +01:00
..
debugger BUG#22309 FileLogHandler::createNewFile() isn't thread safe - may loose log messages 2006-11-03 01:12:30 +11:00
editline Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
kernel Merge perch.ndb.mysql.com:/home/jonas/src/51-work 2006-12-01 11:32:52 +01:00
logger Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 2006-11-30 15:31:20 +01:00
mgmapi Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 2006-12-01 11:35:05 +08:00
mgmcommon Merge perch.ndb.mysql.com:/home/jonas/src/50-work 2006-09-15 11:43:49 +02:00
ndbapi Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 2006-12-01 11:35:05 +08:00
newtonapi Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
portlib remove OSE 2006-11-03 02:18:45 +11:00
transporter remove OSE 2006-11-03 02:18:45 +11:00
util Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 2006-12-01 21:12:13 +01:00
Makefile.am Merge 2005-10-07 01:12:46 +02:00
ndb_constants.h NDB temporary tables. 2006-09-07 15:09:34 +02:00
ndb_global.h.in Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02: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 BUG#21253 NdbApi.h should not include my_config.h 2006-10-16 17:01:01 +10:00
ndb_version.h.in Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge 2006-10-18 18:51:39 +10:00