diff options
author | unknown <mkindahl@dl145h.mysql.com> | 2008-02-07 12:38:13 +0100 |
---|---|---|
committer | unknown <mkindahl@dl145h.mysql.com> | 2008-02-07 12:38:13 +0100 |
commit | 1c48bea250671d2e0f96a985dbe803a924d1c1d3 (patch) | |
tree | e70159eb7cfa29b10a1e25850a485620ccfaf4f7 /mysql-test/suite/binlog/std_data | |
parent | 3b44afb07f36580e652a92c90433a6cc80159e89 (diff) | |
parent | 2a482933b6da71bf3cd5b18a4c1a50b06ab3e5d3 (diff) | |
download | mariadb-git-1c48bea250671d2e0f96a985dbe803a924d1c1d3.tar.gz |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
mysql-test/suite/binlog/t/binlog_old_versions.test:
Auto merged
Diffstat (limited to 'mysql-test/suite/binlog/std_data')
-rw-r--r-- | mysql-test/suite/binlog/std_data/bug32407.001 (renamed from mysql-test/suite/binlog/std_data/binlog-bug32407.000001) | bin | 368 -> 368 bytes |
-rw-r--r-- | mysql-test/suite/binlog/std_data/ver_5_1-telco.001 (renamed from mysql-test/suite/binlog/std_data/binlog_old_version_5_1-telco.000001) | bin | 150385 -> 150385 bytes |
-rw-r--r-- | mysql-test/suite/binlog/std_data/ver_5_1-wl2325_r.001 (renamed from mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_row.000001) | bin | 705 -> 705 bytes |
-rw-r--r-- | mysql-test/suite/binlog/std_data/ver_5_1-wl2325_s.001 (renamed from mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_stm.000001) | bin | 149796 -> 149796 bytes |
-rw-r--r-- | mysql-test/suite/binlog/std_data/ver_5_1_17.001 (renamed from mysql-test/suite/binlog/std_data/binlog_old_version_5_1_17.000001) | bin | 150385 -> 150385 bytes |
-rw-r--r-- | mysql-test/suite/binlog/std_data/ver_5_1_23.001 (renamed from mysql-test/suite/binlog/std_data/binlog_old_version_5_1_23.000001) | bin | 150402 -> 150402 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/mysql-test/suite/binlog/std_data/binlog-bug32407.000001 b/mysql-test/suite/binlog/std_data/bug32407.001 Binary files differindex c73243707ef..c73243707ef 100644 --- a/mysql-test/suite/binlog/std_data/binlog-bug32407.000001 +++ b/mysql-test/suite/binlog/std_data/bug32407.001 diff --git a/mysql-test/suite/binlog/std_data/binlog_old_version_5_1-telco.000001 b/mysql-test/suite/binlog/std_data/ver_5_1-telco.001 Binary files differindex 76856cb04a2..76856cb04a2 100644 --- a/mysql-test/suite/binlog/std_data/binlog_old_version_5_1-telco.000001 +++ b/mysql-test/suite/binlog/std_data/ver_5_1-telco.001 diff --git a/mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_row.000001 b/mysql-test/suite/binlog/std_data/ver_5_1-wl2325_r.001 Binary files differindex 47071c011f9..47071c011f9 100644 --- a/mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_row.000001 +++ b/mysql-test/suite/binlog/std_data/ver_5_1-wl2325_r.001 diff --git a/mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_stm.000001 b/mysql-test/suite/binlog/std_data/ver_5_1-wl2325_s.001 Binary files differindex 4302bfed879..4302bfed879 100644 --- a/mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_stm.000001 +++ b/mysql-test/suite/binlog/std_data/ver_5_1-wl2325_s.001 diff --git a/mysql-test/suite/binlog/std_data/binlog_old_version_5_1_17.000001 b/mysql-test/suite/binlog/std_data/ver_5_1_17.001 Binary files differindex 9b6e200e492..9b6e200e492 100644 --- a/mysql-test/suite/binlog/std_data/binlog_old_version_5_1_17.000001 +++ b/mysql-test/suite/binlog/std_data/ver_5_1_17.001 diff --git a/mysql-test/suite/binlog/std_data/binlog_old_version_5_1_23.000001 b/mysql-test/suite/binlog/std_data/ver_5_1_23.001 Binary files differindex 0e9a9d1470a..0e9a9d1470a 100644 --- a/mysql-test/suite/binlog/std_data/binlog_old_version_5_1_23.000001 +++ b/mysql-test/suite/binlog/std_data/ver_5_1_23.001 |