mariadb/support-files
unknown 1698b4f2dd Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community-formerge51
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-formergecomm


include/config-win.h:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/r/func_in.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
mysql-test/t/func_in.test:
  Auto merged
ndb/src/ndbapi/DictCache.cpp:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
configure.in:
  Manual merge, convert to default community-features off.
sql/set_var.cc:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
support-files/mysql.spec.sh:
  Manual merge.
  
  Disable the community-server advertisement for Enterprise.  Re-enable
  this later.
2007-04-25 08:14:46 -04:00
..
debian Many files: 2005-01-01 20:54:45 +01:00
MacOSX my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
RHEL4-SElinux For Linux systems running RHEL 4 (which includes SE-Linux), we need to provide 2007-01-25 17:51:21 +01: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
compiler_warnings.supp add comment to compiler_warnings.supp 2007-03-08 18:12:16 +01:00
magic sql/log.cc 2000-10-05 17:58:16 -06:00
Makefile.am Compiler warning suppression fix: Add missing file to 'make dist'. 2007-02-26 08:11:10 +01: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 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-31 11:54:36 +02: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 support-files/MySQL-shared-compat.spec.sh : Dummy, irrelevant change - just trigger a new build. 2007-01-10 00:36:41 +01:00
mysql.server-sys5.sh Small bug fixes 2000-09-07 04:55:17 +03:00
mysql.server.sh BUG#26952: mysql.server needs to be able to not timeout in certain situations 2007-03-13 06:06:09 -07:00
mysql.spec.sh Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community-formerge51 2007-04-25 08:14:46 -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