mariadb/mysql-test/std_data
unknown 3ad402570d Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
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
2008-04-03 11:50:43 +02:00
..
ndb_backup50 BUG#22240 Add a test case into ndb_restore_compat 2007-08-17 11:41:32 +08:00
ndb_backup51 modified ndb backup/restore to be byte order independant 2006-04-25 14:02:15 +02:00
ndb_backup51_data_be BUG#27543 Backup and restore can compatible with different endians for blob attribute 2007-09-05 13:01:30 +00:00
ndb_backup51_data_le BUG#27543 Backup and restore can compatible with different endians for blob attribute 2007-09-05 13:01:30 +00:00
parts Fixes for the following bugs: 2007-08-27 14:08:32 -06:00
14897.frm A fix for Bug#14897 "ResultSet.getString("table.column") sometimes 2006-08-30 00:38:58 +04:00
bad_gis_data.dat bug #22372 2006-12-06 21:47:29 +04:00
bug15328.cnf Bug#15328 Segmentation fault occured if my.cnf is invalid for escape sequence 2006-05-11 14:13:14 +02:00
bug16266.000001 Fix for BUG#16266: Definer is not fully qualified error during replication. 2006-03-01 14:13:07 +03:00
bug19371.frm Bug#19371 VARBINARY() have trailing zeros after upgrade from 4.1 2006-11-09 12:00:27 +01:00
bug19371.MYD Bug#19371 VARBINARY() have trailing zeros after upgrade from 4.1 2006-11-09 12:00:27 +01:00
bug19371.MYI Bug#19371 VARBINARY() have trailing zeros after upgrade from 4.1 2006-11-09 12:00:27 +01:00
bug30435_5k.txt bug#30435 2007-12-23 11:18:46 +02:00
bug30435_10k_items.txt bug#30435 2007-12-23 11:18:46 +02:00
bug33029-slave-relay-bin.000001 BUG#33029 5.0 to 5.1 replication fails on dup key when inserting 2008-03-14 11:35:41 +08:00
bug35469.dat Fix tree: 2008-03-28 23:39:47 +03:00
cacert.pem SSL/Makefile.am mysql-test/Makefile.am: 2007-07-27 17:39:07 +02:00
client-cert.pem SSL/Makefile.am mysql-test/Makefile.am: 2007-07-27 17:39:07 +02:00
client-key.pem SSL/Makefile.am mysql-test/Makefile.am: 2007-07-27 17:39:07 +02:00
corrupt-relay-bin.000624 BUG#31793 (log event corruption causes crash): 2007-11-09 13:43:09 +01:00
des_key_file
Index.xml Bug#28916 LDML doesn't work for utf8 2007-06-07 17:55:55 +05:00
init_file.dat Bug#23240 --init_file statements with NOW() reports '1970-01-01 11:00:00'as the date time 2007-02-19 14:57:54 +01:00
loaddata1.dat
loaddata2.dat
loaddata3.dat
loaddata4.dat
loaddata5.dat Fix LOAD DATA to handle having the escape and enclosed-by character 2005-06-22 16:14:14 -07:00
loaddata6.dat Bug#15126 character_set_database is not replicated (LOAD DATA INFILE need it) 2007-02-28 17:06:57 +04:00
loaddata_dq.dat Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-10-26 14:11:08 -07:00
loaddata_pair.dat Bug#11401: Setting thd->lex so that engines (i.e., InnoDB) recognizes 2005-07-05 13:55:54 +02:00
master-bin.000001
Moscow_leap
ndb_config_config.ini WL#4189 2007-12-12 18:19:24 +01:00
ndb_config_mycnf1.cnf ndb 2005-09-30 12:19:15 +02:00
ndb_config_mycnf2.cnf Bug #13009 No gaps allowed in node id number sequence 2005-10-12 14:17:39 +02:00
old_table-323.frm Added --debug-info to most clients to detect memory leaks in mysql-test-run 2006-11-21 22:32:58 +02:00
rpl_loaddata.dat
rpl_loaddata2.dat
rpl_timezone.dat testing repl of timezone with LOAD DATA INFILE (hourra!) 2005-03-24 16:43:50 +01:00
rpl_timezone2.dat WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
server-cert-des.pem Bug#21868 Server crashes if encrypted certificate key provided 2006-09-25 16:44:15 +02:00
server-cert.pem SSL/Makefile.am mysql-test/Makefile.am: 2007-07-27 17:39:07 +02:00
server-key-des.pem Bug#21868 Server crashes if encrypted certificate key provided 2006-09-25 16:44:15 +02:00
server-key.pem SSL/Makefile.am mysql-test/Makefile.am: 2007-07-27 17:39:07 +02:00
server8k-cert.pem Bug #29784 YaSSL assertion failure when reading 8k key. 2007-07-17 14:43:56 -04:00
server8k-key.pem Bug #29784 YaSSL assertion failure when reading 8k key. 2007-07-17 14:43:56 -04:00
trunc_binlog.000001
untrusted-cacert.pem Add an untrusted cacert used when testing 2006-05-03 14:10:22 +02:00
vchar.frm
warnings_loaddata.dat
words.dat
words2.dat WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00