unknown 2d35684e7f Merge mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92 ... into mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss92 mysql-test/t/ndb_read_multi_range.test: Auto merged configure.in: Merged mysql-test/r/innodb.result: Null merge mysql-test/t/innodb.test: Null merge sql/ha_innodb.cc: Null merge storage/innobase/btr/btr0sea.c: Null merge storage/innobase/dict/dict0dict.c: Null merge storage/innobase/dict/dict0load.c: Null merge storage/innobase/include/buf0buf.h: Null merge storage/innobase/include/dict0dict.h: Null merge storage/innobase/include/dict0load.h: Null merge storage/innobase/include/os0file.h: Null merge storage/innobase/include/rem0cmp.h: Null merge storage/innobase/include/srv0srv.h: Null merge storage/innobase/rem/rem0cmp.c: Null merge storage/innobase/row/row0ins.c: Null merge storage/innobase/row/row0mysql.c: Null merge storage/innobase/srv/srv0srv.c: Null merge storage/innobase/srv/srv0start.c: Null merge storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto-merge storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto-merge support-files/mysql.spec.sh: Auto-merge		2005-12-13 23:56:22 +03:00
..
debian	Many files:	2005-01-01 20:54:45 +01:00
MacOSX	- after merge fixes	2005-10-28 11:10:29 +02:00
SCO	- added support-files/MacOSX to include files specific for building	2003-02-03 20:39:48 +01:00
.cvsignore	Import changeset	2000-07-31 21:29:14 +02:00
binary-configure.sh	Fixes for fill_help_tables.sql	2003-03-21 18:53:55 +02:00
build-tags	Here comes a nasty patch, although I am not ready to push it yet. I will	2002-01-19 19:16:52 -07:00
magic	sql/log.cc	2000-10-05 17:58:16 -06:00
Makefile.am	Makefile.am, configure.in:	2005-09-24 15:51:45 +02:00
my-huge.cnf.sh	Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1	2005-10-31 11:54:36 +02:00
my-innodb-heavy-4G.cnf.sh	Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1	2005-10-31 11:54:36 +02:00
my-large.cnf.sh	Sync suggestions for bdb_cache_size in my-medium.cnf and my-huge.cnf to	2005-11-11 11:41:23 -08:00
my-medium.cnf.sh	Sync suggestions for bdb_cache_size in my-medium.cnf and my-huge.cnf to	2005-11-11 11:41:23 -08:00
my-small.cnf.sh	Encourage user to specify a name for the binlog index file (either by giving an argument to --log-bin,	2005-01-11 00:16:07 +01:00
mysql-log-rotate.sh	- small improvement for the logrotate config file (patch found in the SUSE	2005-01-18 17:35:32 +01:00
mysql-multi.server.sh	Changed safe_mysqld -> mysqld_safe	2001-06-28 10:49:16 +03:00
MySQL-shared-compat.spec.sh	- added the 4.1 shared client libraries to the 5.0 shared-compat RPM	2005-01-13 14:54:18 +01:00
mysql.server-sys5.sh	Small bug fixes	2000-09-07 04:55:17 +03:00
mysql.server.sh	Fix handling of libexecdir and sbindir in mysql.server, and note that	2005-08-26 12:02:06 -07:00
mysql.spec.sh	Merge mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92	2005-12-13 23:56:22 +03:00
mysqld_multi.server.sh	Added possibility to use [GNR...] optional argument for	2004-10-09 13:57:27 +03:00
ndb-config-2-node.ini.sh	made an .sh file of ndb-config-2-node.ini instead	2005-02-03 17:58:02 +01:00