mariadb/storage/ndb/config
unknown 53212ec5f5 Merge mysql.com:/usr/local/mysql/mysql-5.0-sol10-sparc-a-fix
into  mysql.com:/usr/local/mysql/mysql-5.1-new


storage/ndb/src/common/portlib/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
  Auto merged
storage/ndb/config/common.mk.am:
  Manual merge.
2006-01-11 09:21:11 +01:00
..
common.mk.am Merge mysql.com:/usr/local/mysql/mysql-5.0-sol10-sparc-a-fix 2006-01-11 09:21:11 +01:00
make-win-dsw.sh Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
type_kernel.mk.am All changes for change to all storage engines being under storage directory. 2005-04-26 19:04:36 -07:00
type_mgmapiclient.mk.am All changes for change to all storage engines being under storage directory. 2005-04-26 19:04:36 -07:00
type_ndbapi.mk.am Merge mysql.com:/home/my/mysql-5.0 2005-11-05 01:32:55 +02:00
type_ndbapiclient.mk.am All changes for change to all storage engines being under storage directory. 2005-04-26 19:04:36 -07:00
type_ndbapitest.mk.am All changes for change to all storage engines being under storage directory. 2005-04-26 19:04:36 -07:00
type_ndbapitools.mk.am All changes for change to all storage engines being under storage directory. 2005-04-26 19:04:36 -07:00
type_util.mk.am Merge mysql.com:/home/my/mysql-5.0 2005-11-05 01:32:55 +02:00
win-includes Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
win-lib.am Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
win-libraries Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
win-name Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
win-prg.am Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
win-sources Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00