mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
32f349ed75
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint BitKeeper/etc/collapsed: auto-union configure.in: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/extra/rpl_tests/rpl_deadlock.test: Auto merged mysql-test/mysql-test-run-shell.sh: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/windows.result: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/windows.test: Auto merged sql/item.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/mysqld.cc: Auto merged sql-common/my_time.c: Auto merged sql/sql_parse.cc: Auto merged BitKeeper/deleted/.del-ps_not_windows.result: Delete: mysql-test/r/ps_not_windows.result BitKeeper/deleted/.del-ps_not_windows.test: Delete: mysql-test/t/ps_not_windows.test mysql-test/mysql-test-run.pl: Manual merge mysql-test/r/rpl_deadlock_innodb.result: Manual merge |
||
---|---|---|
.. | ||
MacOSX | ||
SCO | ||
.cvsignore | ||
binary-configure.sh | ||
build-tags | ||
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 |