unknown 7f33809731 Manual merge ...

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged

2005-05-05 13:47:09 +04:00

..

debian

Many files:

2005-01-01 20:54:45 +01:00

MacOSX

mwcc-wrapper, compile-darwin-mwcc, mwar-wrapper:

2005-05-05 09:34:15 +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

Step 1 of the switch to support configuration with NPTL:

2005-04-20 20:10:28 +02:00

my-huge.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

my-innodb-heavy-4G.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

my-large.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

my-medium.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

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-max.spec.sh

Changed safe_mysqld -> mysqld_safe

2001-06-28 10:49:16 +03: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

Merge mysql.com:/space/my/mysql-4.1-bug9444

2005-05-04 15:00:18 +02:00

mysql.spec.sh

- manual merge

2005-04-21 08:30:59 +02: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