mariadb/storage
unknown 5459c9709e Merge xiphis.org:/home/antony/work2/mysql-5.1
into  xiphis.org:/home/antony/work3/mysql-5.1-plugable-2


configure.in:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/sql_table.cc:
  SCCS merged
2005-12-21 10:26:39 -08:00
..
bdb Merge mysql.com:/usr/local/mysql/mysql-mawk 2005-12-14 13:24:26 +01:00
csv Finalize storage engine plugins 2005-12-21 10:18:40 -08:00
example Finalize storage engine plugins 2005-12-21 10:18:40 -08:00
heap WL #528: Faster free_tmp_table 2005-11-06 08:29:03 +01:00
innobase storage/innobase/Makefile.am : 2005-12-16 12:45:43 +01:00
myisam Bug fix for bug #15843 "Added mmap support in myisam creates compile problem 2005-12-19 14:16:21 +01:00
myisammrg Merge mysql.com:/home/my/mysql-5.0 2005-11-05 01:32:55 +02:00
ndb Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push 2005-12-14 14:03:50 +01:00
Makefile.am make dist target fixes 2005-05-16 14:11:42 +02:00