mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 10:14:19 +01:00
df8543868d
conflicts: Text conflict in client/mysqltest.cc Text conflict in mysql-test/include/wait_until_connected_again.inc Text conflict in mysql-test/lib/mtr_report.pm Text conflict in mysql-test/mysql-test-run.pl Text conflict in mysql-test/r/events_bugs.result Text conflict in mysql-test/r/log_state.result Text conflict in mysql-test/r/myisam_data_pointer_size_func.result Text conflict in mysql-test/r/mysqlcheck.result Text conflict in mysql-test/r/query_cache.result Text conflict in mysql-test/r/status.result Text conflict in mysql-test/suite/binlog/r/binlog_index.result Text conflict in mysql-test/suite/binlog/r/binlog_innodb.result Text conflict in mysql-test/suite/rpl/r/rpl_packet.result Text conflict in mysql-test/suite/rpl/t/rpl_packet.test Text conflict in mysql-test/t/disabled.def Text conflict in mysql-test/t/events_bugs.test Text conflict in mysql-test/t/log_state.test Text conflict in mysql-test/t/myisam_data_pointer_size_func.test Text conflict in mysql-test/t/mysqlcheck.test Text conflict in mysql-test/t/query_cache.test Text conflict in mysql-test/t/rpl_init_slave_func.test Text conflict in mysql-test/t/status.test |
||
|---|---|---|
| .. | ||
| funcs_1 | ||
| ndb_backup50 | ||
| ndb_backup51 | ||
| ndb_backup51_data_be | ||
| ndb_backup51_data_le | ||
| parts | ||
| 14897.frm | ||
| bad_gis_data.dat | ||
| bug15328.cnf | ||
| bug16266.000001 | ||
| bug19371.frm | ||
| bug19371.MYD | ||
| bug19371.MYI | ||
| bug30435_5k.txt | ||
| bug30435_10k_items.txt | ||
| bug33029-slave-relay-bin.000001 | ||
| bug35469.dat | ||
| bug36055.frm | ||
| bug36055.MYD | ||
| bug36055.MYI | ||
| bug40482-bin.000001 | ||
| cacert.pem | ||
| charset_utf8.txt | ||
| client-cert.pem | ||
| client-key.pem | ||
| corrupt-relay-bin.000624 | ||
| corrupt_t1#P#p1.MYI | ||
| corrupt_t1.MYI | ||
| des_key_file | ||
| Index.xml | ||
| init_file.dat | ||
| loaddata1.dat | ||
| loaddata2.dat | ||
| loaddata3.dat | ||
| loaddata4.dat | ||
| loaddata5.dat | ||
| loaddata6.dat | ||
| loaddata_dq.dat | ||
| loaddata_pair.dat | ||
| master-bin.000001 | ||
| Moscow_leap | ||
| ndb_config_config.ini | ||
| ndb_config_mycnf1.cnf | ||
| ndb_config_mycnf2.cnf | ||
| numbers.txt | ||
| old_table-323.frm | ||
| rpl_bug28618.dat | ||
| rpl_loaddata.dat | ||
| rpl_loaddata2.dat | ||
| rpl_mixed.dat | ||
| rpl_timezone.dat | ||
| rpl_timezone2.dat | ||
| server-cert-des.pem | ||
| server-cert.pem | ||
| server-key-des.pem | ||
| server-key.pem | ||
| server8k-cert.pem | ||
| server8k-key.pem | ||
| trunc_binlog.000001 | ||
| untrusted-cacert.pem | ||
| vchar.frm | ||
| warnings_loaddata.dat | ||
| words.dat | ||
| words2.dat | ||