mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 19:41:47 +01:00
3ad402570d
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-rpl_row_charset.test: Auto merged CMakeLists.txt: Auto merged configure.in: Auto merged client/mysqltest.c: Auto merged mysql-test/extra/binlog_tests/blackhole.test: Auto merged mysql-test/include/commit.inc: Auto merged mysql-test/include/mix1.inc: Auto merged mysql-test/lib/mtr_report.pm: Auto merged mysql-test/r/commit_1innodb.result: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/ctype_big5.result: Auto merged mysql-test/r/drop.result: Auto merged mysql-test/r/group_by.result: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/r/loaddata.result: Auto merged mysql-test/r/mysqlbinlog.result: Auto merged mysql-test/r/partition_error.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: Auto merged mysql-test/suite/binlog/r/binlog_stm_blackhole.result: Auto merged mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: Auto merged mysql-test/suite/binlog/r/binlog_unsafe.result: Auto merged mysql-test/suite/binlog/t/binlog_unsafe.test: Auto merged mysql-test/suite/federated/federated.result: Auto merged mysql-test/suite/federated/federated.test: Auto merged mysql-test/suite/parts/r/partition_alter1_myisam.result: Auto merged mysql-test/suite/parts/r/partition_alter2_myisam.result: Auto merged mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result: Auto merged mysql-test/suite/rpl/r/rpl_row_log.result: Auto merged mysql-test/suite/rpl/r/rpl_row_log_innodb.result: Auto merged mysql-test/suite/rpl/t/disabled.def: Auto merged mysql-test/suite/rpl/t/rpl_flushlog_loop.test: Auto merged mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/csv.test: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/distinct.test: Auto merged mysql-test/t/drop.test: Auto merged mysql-test/t/group_by.test: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/loaddata.test: Auto merged mysql-test/t/partition_error.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/view.test: Auto merged mysql-test/t/warnings.test: Auto merged sql/ha_ndbcluster.cc: Auto merged BitKeeper/deleted/.del-combinations: Delete: mysql-test/suite/binlog/combinations mysql-test/r/partition_not_windows.result: Use remote mysql-test/r/partition_symlink.result: Use remote mysql-test/r/symlink.result: SCCS merged mysql-test/suite/parts/inc/partition_basic.inc: SCCS merged mysql-test/suite/parts/inc/partition_check_drop.inc: Use remote mysql-test/suite/parts/inc/partition_layout_check1.inc: Use remote mysql-test/suite/parts/inc/partition_layout_check2.inc: Use remote mysql-test/suite/parts/r/partition_basic_innodb.result: Use remote mysql-test/suite/parts/r/partition_basic_myisam.result: Use remote mysql-test/suite/parts/r/partition_engine_myisam.result: Use remote mysql-test/suite/parts/t/partition_sessions.test: SCCS merged mysql-test/t/partition.test: SCCS merged mysql-test/t/partition_not_windows.test: Use remote mysql-test/t/partition_symlink.test: Use remote mysql-test/t/symlink.test: Use remote mysql-test/suite/binlog/r/binlog_multi_engine.result: Manual merge, name of binlog file changed mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test: Manual merge mysys/my_init.c: Manual merge |
||
---|---|---|
.. | ||
loaddata_autocom_ndb.result | ||
ndb_alter_table.result | ||
ndb_alter_table2.result | ||
ndb_alter_table3.result | ||
ndb_auto_increment.result | ||
ndb_autoinc.result | ||
ndb_basic.result | ||
ndb_binlog_basic.result | ||
ndb_binlog_ddl_multi.result | ||
ndb_binlog_discover.result | ||
ndb_binlog_format.result | ||
ndb_binlog_ignore_db.result | ||
ndb_binlog_log_bin.result | ||
ndb_binlog_multi.result | ||
ndb_bitfield.result | ||
ndb_blob.result | ||
ndb_blob_partition.result | ||
ndb_bug26793.result | ||
ndb_bug31477.result | ||
ndb_cache.result | ||
ndb_cache2.result | ||
ndb_cache_multi.result | ||
ndb_cache_multi2.result | ||
ndb_charset.result | ||
ndb_condition_pushdown.result | ||
ndb_config.result | ||
ndb_config2.result | ||
ndb_cursor.result | ||
ndb_database.result | ||
ndb_dd_alter.result | ||
ndb_dd_basic.result | ||
ndb_dd_ddl.result | ||
ndb_dd_disk2memory.result | ||
ndb_dd_dump.result | ||
ndb_dd_sql_features.result | ||
ndb_gis.result | ||
ndb_grant.result | ||
ndb_index.result | ||
ndb_index_ordered.result | ||
ndb_index_unique.result | ||
ndb_insert.result | ||
ndb_limit.result | ||
ndb_load.result | ||
ndb_loaddatalocal.result | ||
ndb_lock.result | ||
ndb_lock_table.result | ||
ndb_minmax.result | ||
ndb_multi.result | ||
ndb_multi_row.result | ||
ndb_partition_error.result | ||
ndb_partition_error2.result | ||
ndb_partition_key.result | ||
ndb_partition_list.result | ||
ndb_partition_range.result | ||
ndb_read_multi_range.result | ||
ndb_rename.result | ||
ndb_replace.result | ||
ndb_restore.result | ||
ndb_restore_compat.result | ||
ndb_restore_different_endian_data.result | ||
ndb_restore_partition.result | ||
ndb_restore_print.result | ||
ndb_row_format.result | ||
ndb_single_user.result | ||
ndb_sp.result | ||
ndb_subquery.result | ||
ndb_temporary.result | ||
ndb_transaction.result | ||
ndb_trigger.result | ||
ndb_truncate.result | ||
ndb_types.result | ||
ndb_update.result | ||
ndb_update_no_read.result | ||
ndb_view.result | ||
ndbapi.result | ||
ps_7ndb.result | ||
strict_autoinc_5ndb.result |