mariadb/support-files
unknown ceadd59644 Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1
into  janus.mylan:/usr/home/serg/Abk/mysql-maria1


Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysys/mf_tempfile.c:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
BUILD/compile-dist:
  SCCS merged
2007-10-08 21:01:44 +02:00
..
MacOSX
RHEL4-SElinux For Linux systems running RHEL 4 (which includes SE-Linux), we need to provide 2007-01-25 17:51:21 +01:00
SCO
.cvsignore
binary-configure.sh
build-tags
compiler_warnings.supp Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria 2007-07-04 12:20:53 +03:00
magic Fixes after review of guilhem of block record patch 2007-04-19 13:18:56 +03:00
Makefile.am make_binary_distribution.sh: 2007-09-26 20:19:33 +02:00
my-huge.cnf.sh
my-innodb-heavy-4G.cnf.sh
my-large.cnf.sh
my-medium.cnf.sh
my-small.cnf.sh
mysql-log-rotate.sh
mysql-multi.server.sh
MySQL-shared-compat.spec.sh
mysql.m4 /usr/share/aclocal/mysql.m4 2007-02-14 12:42:11 +01:00
mysql.server-sys5.sh
mysql.server.sh Makefile.am, make_binary_distribution.sh: 2007-09-27 12:21:56 +02:00
mysql.spec.sh "ndb_size.tmpl" is gone (NDB change 2007-04-24), so remove it from the spec file. 2007-05-02 17:10:41 +02:00
mysqld_multi.server.sh
ndb-config-2-node.ini.sh