mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
19c2ce47db
BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-Makefile.am: Auto merged BitKeeper/deleted/.del-Makefile.am~1: Delete: Docs/Images/Makefile.am client/mysqltest.c: Auto merged include/mysql.h: Auto merged libmysql/libmysql.c: Auto merged myisam/mi_check.c: Auto merged mysql-test/r/grant.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/t/grant.test: Auto merged mysql-test/t/mix_innodb_myisam_binlog.test: Auto merged mysql-test/t/ps_1general.test: Auto merged sql/field.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/mysqld.cc: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/sql_acl.cc: Auto merged sql/sql_table.cc: Auto merged sql/time.cc: Auto merged sql-common/my_time.c: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/serbian/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged configure.in: Merge with 4.0 mysql-test/r/mix_innodb_myisam_binlog.result: Merge with 4.0 mysys/default.c: Merge with 4.1 (to get new extension handling) sql/log.cc: Merge with 4.0 tests/client_test.c: Merge with 4.1 (to get possibility to run any tests) |
||
---|---|---|
.. | ||
.cvsignore | ||
fill_func_tables.sh | ||
fill_help_tables.sh | ||
make_binary_distribution.sh | ||
make_sharedlib_distribution.sh | ||
make_win_binary_distribution.sh | ||
make_win_src_distribution.sh | ||
Makefile.am | ||
msql2mysql.sh | ||
mysql_config.sh | ||
mysql_convert_table_format.sh | ||
mysql_create_system_tables.sh | ||
mysql_explain_log.sh | ||
mysql_find_rows.sh | ||
mysql_fix_extensions.sh | ||
mysql_fix_privilege_tables.sh | ||
mysql_fix_privilege_tables.sql | ||
mysql_install_db.sh | ||
mysql_prepare_privilege_tables_for_5.sql | ||
mysql_secure_installation.sh | ||
mysql_setpermission.sh | ||
mysql_tableinfo.sh | ||
mysql_zap.sh | ||
mysqlaccess.conf | ||
mysqlaccess.sh | ||
mysqlbug.sh | ||
mysqld_multi.sh | ||
mysqld_safe-watch.sh | ||
mysqld_safe.sh | ||
mysqldumpslow.sh | ||
mysqlhotcopy.sh |