mariadb/mysql-test/include
unknown 7473c70b8e Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore


BitKeeper/deleted/.del-ndb_backup.inc:
  Delete: mysql-test/include/ndb_backup.inc
storage/ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
storage/ndb/tools/restore/consumer_printer.cpp:
  Auto merged
storage/ndb/include/util/OutputStream.hpp:
  manual merge
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  manual merge
storage/ndb/tools/restore/Restore.cpp:
  manual merge
storage/ndb/tools/restore/Restore.hpp:
  manual merge
storage/ndb/tools/restore/restore_main.cpp:
  manual merge
2007-03-07 13:44:54 +07:00
..
analyze_failure_sync_with_master.test
big_test.inc
check-testcase.test
check_var_limit.inc
common-tests.inc
concurrent.inc
ctype_common.inc
ctype_filesort.inc
ctype_innodb_like.inc
ctype_like_escape.inc
deadlock.inc
endspace.inc
federated.inc Merge bk@192.168.21.1:mysql-5.1-opt 2006-12-08 15:49:43 +04:00
federated_cleanup.inc
get_binlog_dump_thread_id.inc
gis_generic.inc
handler.inc
have_archive.inc
have_big5.inc
have_binlog_format_mixed.inc
have_binlog_format_mixed_or_row.inc
have_binlog_format_mixed_or_statement.inc
have_binlog_format_row.inc
have_binlog_format_statement.inc
have_blackhole.inc
have_case_sensitive_file_system.inc
have_compress.inc
have_cp932.inc
have_cp1250_ch.inc
have_crypt.inc
have_csv.inc
have_debug.inc
have_eucjpms.inc
have_euckr.inc
have_example_plugin.inc Add support for loading example plugin and add plugin.test 2006-12-15 00:09:56 +01:00
have_exampledb.inc
have_federated_db.inc
have_gb2312.inc
have_gbk.inc
have_geometry.inc
have_innodb.inc
have_latin2_ch.inc
have_lowercase0.inc
have_multi_ndb.inc Wait for mysqld connected to NDB to come out of read only mode 2006-12-22 13:34:23 +01:00
have_ndb.inc Remove wait until not readonly 2007-01-16 09:38:09 +01:00
have_ndb_extra.inc
have_ndbapi_examples.inc
have_openssl.inc
have_outfile.inc
have_partition.inc
have_query_cache.inc
have_sjis.inc
have_tis620.inc
have_ucs2.inc
have_udf.inc Add support for loading example plugin and add plugin.test 2006-12-15 00:09:56 +01:00
have_ujis.inc
im_check_env.inc Fixed a LOT of compiler warnings 2006-11-27 01:47:38 +02:00
index_merge1.inc
index_merge2.inc
index_merge_2sweeps.inc
index_merge_ror.inc Merge mysql.com:/home/svoj/devel/mysql/BUG25048/mysql-5.0-engines 2006-12-26 18:04:31 +04:00
index_merge_ror_cpk.inc
innodb_rollback_on_timeout.inc Added innodb_rollback_on_timeout option to restore the 4.1 2006-12-19 16:57:51 -07:00
is_debug_build.inc
loaddata_autocom.inc
master-slave-end.inc
master-slave-reset.inc
master-slave.inc
mix1.inc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-01-22 19:18:22 +02:00
mix2.inc Give warnings for unused objects 2007-01-22 18:42:52 +02:00
mysqltest-x.inc
ndb_backup.inc Bug#26899 ndb_restore cannot restore selected tables and databases 2007-03-07 13:19:37 +07:00
ndb_backup_print.inc Bug#26899 ndb_restore cannot restore selected tables and databases 2007-03-07 13:19:37 +07:00
ndb_default_cluster.inc
ndb_not_readonly.inc Add the missing file 2006-12-22 13:57:33 +01:00
ndb_restore_master.inc
ndb_restore_slave_eoption.inc
ndb_setup_slave.inc Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema 2006-12-01 15:49:07 +01:00
not_as_root.inc
not_embedded.inc
not_ndb.inc
not_ndb_default.inc
not_openssl.inc
not_valgrind.inc
not_windows.inc
parser_bug21114.inc
partition_1.inc
partition_10.inc
partition_11.inc
partition_12.inc
partition_layout.inc
ps_conv.inc
ps_create.inc
ps_modify.inc Give warnings for unused objects 2007-01-22 18:42:52 +02:00
ps_modify1.inc
ps_query.inc
ps_renew.inc
query_cache.inc Give warnings for unused objects 2007-01-22 18:42:52 +02:00
read_many_rows.inc
report-features.test
rowid_order.inc
rpl_multi_engine.inc
rpl_multi_engine3.inc
rpl_stmt_seq.inc
rpl_stmt_seq2.inc
safe_set_to_maybe_ro_var.inc
show_binlog_events.inc
show_msg.inc
show_msg80.inc
sp-vars.inc
strict_autoinc.inc
system_db_struct.inc WL #3031 2006-12-11 11:44:03 -05:00
test_outfile.inc
testdb_only.inc
unsafe_binlog.inc
varchar.inc Give warnings for unused objects 2007-01-22 18:42:52 +02:00
wait_for_query_to_suceed.inc
wait_slave_status.inc
wait_until_connected_again.inc
wait_until_rows_count.inc
windows.inc