mariadb/storage/ndb
unknown 5ad7fdfa95 Merge siva.hindu.god:/home/tsmith/m/bk/51
into  siva.hindu.god:/home/tsmith/m/bk/maint/51


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/outfile.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/my_decimal.cc:
  Auto merged
sql/my_decimal.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/structs.h:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
2007-05-17 14:21:35 -06:00
..
bin Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
config Merge dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 2007-04-24 10:28:11 +08:00
demos Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
docs Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
include Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 2007-05-09 15:04:45 +02:00
lib Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndbapi-examples A few minor cleanups for recent AbortOption behaviour change. 2007-02-20 09:52:18 +01:00
src Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt 2007-05-10 08:06:09 +02:00
test Merge siva.hindu.god:/home/tsmith/m/bk/51 2007-05-17 14:21:35 -06:00
tools Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 2007-05-08 09:52:27 +08:00
Makefile.am Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
plug.in Major changes are plug.in files created for almost all storage engines. A few stray BDB references removed. 2006-08-18 21:19:19 -07:00