mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
a36faa7eda
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge client/client_priv.h: Auto merged include/my_sys.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/suite/rpl/t/rpl_err_ignoredtable.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_view.cc: Auto merged mysql-test/suite/rpl/r/rpl_invoked_features.result: Manual merge. mysql-test/suite/rpl/t/rpl_invoked_features.test: Manual merge. sql/log.cc: Manual merge. |
||
---|---|---|
.. | ||
.cvsignore | ||
CMakeLists.txt | ||
comp_sql.c | ||
fill_help_tables.sql | ||
make_binary_distribution.sh | ||
make_sharedlib_distribution.sh | ||
make_win_bin_dist | ||
Makefile.am | ||
msql2mysql.sh | ||
mysql_config.sh | ||
mysql_convert_table_format.sh | ||
mysql_find_rows.sh | ||
mysql_fix_extensions.sh | ||
mysql_fix_privilege_tables.sh | ||
mysql_install_db.sh | ||
mysql_secure_installation.sh | ||
mysql_setpermission.sh | ||
mysql_system_tables.sql | ||
mysql_system_tables_data.sql | ||
mysql_system_tables_fix.sql | ||
mysql_test_data_timezone.sql | ||
mysql_zap.sh | ||
mysqlaccess.conf | ||
mysqlaccess.sh | ||
mysqlbug.sh | ||
mysqld_multi.sh | ||
mysqld_safe.sh | ||
mysqldumpslow.sh | ||
mysqlhotcopy.sh |