unknown a68075513a Manual merge ...

mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

2006-06-28 19:34:04 +04: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

…

binary-configure.sh

Fixes for fill_help_tables.sql

2003-03-21 18:53:55 +02:00

build-tags

…

magic

…

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

…

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

Manual merge

2006-06-28 19:34:04 +04: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