mariadb/storage/ndb/include
unknown 17c19299af Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


configure.in:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/mysql_system_tables_data.sql:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
2007-10-10 14:15:09 -06:00
..
debugger Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb 2007-06-14 19:57:50 +08:00
editline Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
kernel Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 2007-05-14 10:39:46 +02:00
logger Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
mgmapi get mgmapi error codes into perror 2007-06-14 12:35:35 +02:00
mgmcommon [PATCH] WL#3704 mgmapi timeouts: update NDBAPI usage of mgmapi for timeouts 2007-03-22 22:35:31 +11:00
ndbapi Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 2007-10-08 12:40:21 -04:00
newtonapi Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
portlib align types 2007-09-29 09:26:33 +02:00
transporter Merge mysql.com:/home/my/mysql-5.0 2007-01-27 03:46:45 +02:00
util Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-merge 2007-07-13 10:35:03 +02:00
Makefile.am Makefile.am: 2007-06-14 12:57:32 +02:00
ndb_constants.h Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user 2007-03-23 14:06:00 +01:00
ndb_global.h.in Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca 2007-06-05 18:00:42 +02:00
ndb_init.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
ndb_net.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
ndb_types.h.in Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
ndb_version.h.in fix ndb_version.h so that it is usable and make some functions public to handle ndb version 2007-07-11 14:36:44 +02:00