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


sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2007-02-08 16:02:58 -07:00
..
bin Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
config Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01: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 mysql.com:/windows/Linux_space/MySQL/mysql-5.1 2007-02-07 11:44:41 +01:00
lib Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndbapi-examples Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-12-31 01:04:59 +01:00
src Merge siva.hindu.god:/home/tsmith/m/bk/51 2007-02-08 16:02:58 -07:00
test ndb - some more hugo abort option fix 2007-02-05 21:38:16 +01:00
tools after merge fixes 2007-01-29 16:13:18 +02: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