mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/support-files
History
unknown dea988a048 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/collapsed:
  auto-union
BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Auto merged
include/Makefile.am:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/parser.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/parser.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/system_mysql_db_fix30020.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
mysql-test/r/sp.result:
  Manual merge
mysql-test/r/udf.result:
  Manual merge
mysql-test/t/events_bugs.test:
  Manual merge
sql/share/errmsg.txt:
  Manual merge
support-files/mysql.spec.sh:
  Manual merge
2006-12-04 19:11:55 +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
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
Makefile.am Makefile.am, configure.in: 2005-09-24 15:51:45 +02:00
my-huge.cnf.sh Many files: 2006-08-21 15:34:29 +02:00
my-innodb-heavy-4G.cnf.sh Fixed warning message breakage. 2006-08-13 22:28:41 -07:00
my-large.cnf.sh Many files: 2006-08-21 15:34:29 +02:00
my-medium.cnf.sh Many files: 2006-08-21 15:34:29 +02:00
my-small.cnf.sh Fixed warning message breakage. 2006-08-13 22:28:41 -07: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 neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 2006-11-17 14:45:08 +01:00
mysql.spec.sh Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2006-12-04 19:11:55 +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