mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
1698b4f2dd
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. |
||
---|---|---|
.. | ||
debian | ||
MacOSX | ||
RHEL4-SElinux | ||
SCO | ||
.cvsignore | ||
binary-configure.sh | ||
build-tags | ||
compiler_warnings.supp | ||
magic | ||
Makefile.am | ||
my-huge.cnf.sh | ||
my-innodb-heavy-4G.cnf.sh | ||
my-large.cnf.sh | ||
my-medium.cnf.sh | ||
my-small.cnf.sh | ||
mysql-log-rotate.sh | ||
mysql-multi.server.sh | ||
MySQL-shared-compat.spec.sh | ||
mysql.server-sys5.sh | ||
mysql.server.sh | ||
mysql.spec.sh | ||
mysqld_multi.server.sh | ||
ndb-config-2-node.ini.sh |