mirror of
https://github.com/MariaDB/server.git
synced 2026-04-21 07:45:32 +02:00
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt client/mysql.cc: Auto merged client/mysqltest.c: Auto merged include/mysql_com.h: Auto merged libmysql/CMakeLists.txt: Auto merged myisam/mi_check.c: Auto merged mysql-test/r/delayed.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/t/merge.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/type_datetime.test: Auto merged mysql-test/t/variables.test: Auto merged sql/field.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_class.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/r/func_misc.result: manual merge mysql-test/r/innodb_mysql.result: manual merge mysql-test/t/func_misc.test: manual merge mysql-test/t/innodb_mysql.test: manual merge sql/sql_insert.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 | ||
| make_win_src_distribution_old.sh | ||
| Makefile.am | ||
| msql2mysql.sh | ||
| mysql_config.sh | ||
| mysql_convert_table_format.sh | ||
| mysql_explain_log.sh | ||
| mysql_find_rows.sh | ||
| mysql_fix_extensions.sh | ||
| mysql_fix_privilege_tables.sh | ||
| mysql_install_db.sh | ||
| mysql_prepare_privilege_tables_for_5.sql | ||
| mysql_secure_installation.sh | ||
| mysql_setpermission.sh | ||
| mysql_system_tables.sql | ||
| mysql_system_tables_data.sql | ||
| mysql_system_tables_fix.sql | ||
| mysql_tableinfo.sh | ||
| mysql_test_data_timezone.sql | ||
| mysql_upgrade_shell.sh | ||
| mysql_zap.sh | ||
| mysqlaccess.conf | ||
| mysqlaccess.sh | ||
| mysqlbug.sh | ||
| mysqld_multi.sh | ||
| mysqld_safe-watch.sh | ||
| mysqld_safe.sh | ||
| mysqldumpslow.sh | ||
| mysqlhotcopy.sh | ||