mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-21 07:45:32 +02:00
Code Issues Projects Releases Packages Wiki Activity
mariadb/support-files
History
unknown 93528f2887 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.1-amerge


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
configure.in:
  Manual merge
mysql-test/extra/binlog_tests/blackhole.test:
  Manual merge
mysql-test/r/binlog_stm_blackhole.result:
  Manual merge
sql/ha_myisammrg.cc:
  Manual merge
sql/handler.h:
  Manual merge
storage/blackhole/ha_blackhole.cc:
  Manual merge
support-files/mysql.spec.sh:
  Manual merge
2006-07-24 10:05:17 +02: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 Update the spec file for the shared compat RPM with version info. 2006-01-19 10:44:44 +01:00
mysql.server-sys5.sh Small bug fixes 2000-09-07 04:55:17 +03:00
mysql.server.sh Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M51/bug19353-5.1 2006-06-22 12:22:52 +02:00
mysql.spec.sh Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 2006-07-24 10:05:17 +02: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