mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 23:04:20 +01:00
22b92457fc
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822: Auto merged configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/mysqlbinlog.test: Auto merged mysql-test/t/udf.test: Auto merged mysql-test/t/warnings.test: Auto merged BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb: Auto merged sql/field.cc: Auto merged sql/handler.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sp.cc: Auto merged sql/sql_class.cc: Auto merged support-files/mysql.spec.sh: Auto merged mysql-test/r/sp.result: Manual merge. Place 5.0 test before 5.1 test. mysql-test/t/sp.test: Manual merge. Place 5.0 test before 5.1 test. mysys/my_bitmap.c: Manual merge. scripts/make_binary_distribution.sh: Manual merge. sql/Makefile.am: Manual merge. sql/slave.cc: Manual merge. sql/sql_class.h: Manual merge. sql/sql_parse.cc: Manual merge. sql/sql_select.cc: Manual merge. tests/mysql_client_test.c: 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 |