mariadb/storage
unknown 28a5775b08 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.1


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/myisam/ft_nlq_search.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
2005-10-09 19:10:19 +02:00
..
bdb Add files for bdb/build_win64, and tweak the configuration to skip over 2005-09-22 16:42:39 -07:00
heap Merge 2005-09-12 14:22:06 +02:00
innobase Merge 2005-10-07 01:12:46 +02:00
myisam Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 2005-10-09 19:10:19 +02:00
myisammrg Merge 2005-10-06 10:54:07 +02:00
ndb Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 2005-10-09 19:10:19 +02:00
Makefile.am make dist target fixes 2005-05-16 14:11:42 +02:00