unknown 7547a3f178 Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1 ... into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/grant.test: Auto merged mysql-test/t/mysql.test: Auto merged mysql-test/t/mysql_client_test.test: Auto merged server-tools/instance-manager/listener.cc: Auto merged server-tools/instance-manager/portability.h: Auto merged sql/item_timefunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged tests/mysql_client_test.c: Auto merged client/mysql.cc: manual merge mysql-test/r/grant.result: manual merge		2006-08-24 19:11:51 +02:00
..
MacOSX	- after merge fixes	2005-10-28 11:10:29 +02:00
SCO
.cvsignore
binary-configure.sh
build-tags
magic
Makefile.am
my-huge.cnf.sh	Many files:	2006-08-21 15:34:29 +02:00
my-innodb-heavy-4G.cnf.sh	Fixed warning message breakage.	2006-08-13 22:28:41 -07:00
my-large.cnf.sh	Many files:	2006-08-21 15:34:29 +02:00
my-medium.cnf.sh	Many files:	2006-08-21 15:34:29 +02:00
my-small.cnf.sh	Fixed warning message breakage.	2006-08-13 22:28:41 -07:00
mysql-log-rotate.sh
mysql-multi.server.sh
MySQL-shared-compat.spec.sh	Update the spec file for the shared compat RPM with version info.	2006-01-19 10:44:44 +01:00
mysql.server-sys5.sh
mysql.server.sh	Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M51/bug19353-5.1	2006-06-22 12:22:52 +02:00
mysql.spec.sh	Merge mysql.com:/Users/kent/mysql/bk/bug17194/my51-bug17194	2006-08-24 15:12:08 +02:00
mysqld_multi.server.sh
ndb-config-2-node.ini.sh