mariadb/support-files
unknown 33a2716a85 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new


Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
extra/Makefile.am:
  Auto merged
include/Makefile.am:
  Auto merged
include/my_global.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/key.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/ndb/docs/Makefile.am:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
libmysqld/Makefile.am:
  Merged from 5.0 to 5.1.
sql/ha_berkeley.cc:
  Merged from 5.0 to 5.1.
sql/lex.h:
  Merged from 5.0 to 5.1.
sql/set_var.cc:
  Merged from 5.0 to 5.1.
sql/share/errmsg.txt:
  Merged from 5.0 to 5.1.
sql/sql_lex.h:
  Merged from 5.0 to 5.1.
sql/sql_show.cc:
  Merged from 5.0 to 5.1.
sql/sql_yacc.yy:
  Merged from 5.0 to 5.1.
2005-11-23 14:57:00 +02: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 Manual merge from 4.1 (bug#15145). 2005-11-22 20:30:45 +01: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