mariadb/support-files
unknown 173e5df37f Merge mishka.local:/home/my/mysql-4.1
into  mishka.local:/home/my/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
  Auto merged
BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
BitKeeper/deleted/.del-have_lowercase0.inc:
  Delete: mysql-test/include/have_lowercase0.inc
VC++Files/mysql-test/mysql_test_run_new.dsp:
  Auto merged
configure.in:
  Auto merged
mysql-test/include/ps_conv.inc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
VC++Files/client/mysqltest.dsp:
  manual merge
VC++Files/sql/mysqld.dsp:
  manual merge
mysql-test/r/grant2.result:
  patch merge
mysql-test/r/subselect2.result:
  manual merge
mysql-test/t/grant2.test:
  patch merge
mysys/charset.c:
  Remove already deleted function
sql/examples/ha_archive.h:
  Manual merge
sql/sql_acl.cc:
  manual merge
sql/sql_db.cc:
  merge (no differences)
sql/sql_select.cc:
  manual merge
sql/table.h:
  merge (no differences)
tests/mysql_client_test.c:
  patch merge
2005-08-25 06:55:48 +03:00
..
debian Many files: 2005-01-01 20:54:45 +01:00
MacOSX - Removed a non-fatal error when running the Mac OS X 10.4 PackageMaker: 2005-08-15 15:44:56 +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 Merge mysql.com:/space/my/mysql-4.0-merge 2005-08-12 08:13:02 +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-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 Merge mishka.local:/home/my/mysql-4.1 2005-08-25 06:55:48 +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