diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-21 10:14:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-21 10:14:42 +0200 |
| commit | 9af177042ed0e297b8f26f2c2f8ae00b3a814a90 (patch) | |
| tree | 0d8d2fab7ebeb02f3c25c00ac1543754b625bde8 /mysql-test/std_data | |
| parent | a6add4ff43a905cee1bfd00b2ec2d276018866ce (diff) | |
| parent | 2fe0836eed16ce5809c34064893681f12c77da9f (diff) | |
| download | mariadb-git-9af177042ed0e297b8f26f2c2f8ae00b3a814a90.tar.gz | |
10.0-base merge.
Partitioning/InnoDB changes are *not* merged (they'll come from 5.6)
TokuDB does not compile (not updated to 10.0 SE API)
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/mdev-4645-binlog_checksum.binlog | bin | 0 -> 386 bytes | |||
| -rw-r--r-- | mysql-test/std_data/mdev-4645-binlog_group_id.binlog | bin | 0 -> 398 bytes | |||
| -rw-r--r-- | mysql-test/std_data/mdev-4645-binlog_group_id_checksum.binlog | bin | 0 -> 410 bytes | |||
| -rw-r--r-- | mysql-test/std_data/mdev-4645-binlog_none.binlog | bin | 0 -> 374 bytes | |||
| -rw-r--r-- | mysql-test/std_data/mdev5029_1.frm | bin | 0 -> 8602 bytes | |||
| -rw-r--r-- | mysql-test/std_data/mdev5029_2.MAD | bin | 0 -> 8192 bytes | |||
| -rw-r--r-- | mysql-test/std_data/mdev5029_2.MAI | bin | 0 -> 8192 bytes | |||
| -rw-r--r-- | mysql-test/std_data/mdev5029_2.frm | bin | 0 -> 8602 bytes | |||
| -rw-r--r-- | mysql-test/std_data/pbxt_load_unique_error1.inc | 5 |
9 files changed, 0 insertions, 5 deletions
diff --git a/mysql-test/std_data/mdev-4645-binlog_checksum.binlog b/mysql-test/std_data/mdev-4645-binlog_checksum.binlog Binary files differnew file mode 100644 index 00000000000..861e9b4fd67 --- /dev/null +++ b/mysql-test/std_data/mdev-4645-binlog_checksum.binlog diff --git a/mysql-test/std_data/mdev-4645-binlog_group_id.binlog b/mysql-test/std_data/mdev-4645-binlog_group_id.binlog Binary files differnew file mode 100644 index 00000000000..a9a6722bea2 --- /dev/null +++ b/mysql-test/std_data/mdev-4645-binlog_group_id.binlog diff --git a/mysql-test/std_data/mdev-4645-binlog_group_id_checksum.binlog b/mysql-test/std_data/mdev-4645-binlog_group_id_checksum.binlog Binary files differnew file mode 100644 index 00000000000..a936ffb139a --- /dev/null +++ b/mysql-test/std_data/mdev-4645-binlog_group_id_checksum.binlog diff --git a/mysql-test/std_data/mdev-4645-binlog_none.binlog b/mysql-test/std_data/mdev-4645-binlog_none.binlog Binary files differnew file mode 100644 index 00000000000..7ceeca9e8c1 --- /dev/null +++ b/mysql-test/std_data/mdev-4645-binlog_none.binlog diff --git a/mysql-test/std_data/mdev5029_1.frm b/mysql-test/std_data/mdev5029_1.frm Binary files differnew file mode 100644 index 00000000000..de169a20953 --- /dev/null +++ b/mysql-test/std_data/mdev5029_1.frm diff --git a/mysql-test/std_data/mdev5029_2.MAD b/mysql-test/std_data/mdev5029_2.MAD Binary files differnew file mode 100644 index 00000000000..3dcc005ec0d --- /dev/null +++ b/mysql-test/std_data/mdev5029_2.MAD diff --git a/mysql-test/std_data/mdev5029_2.MAI b/mysql-test/std_data/mdev5029_2.MAI Binary files differnew file mode 100644 index 00000000000..3533a1d705a --- /dev/null +++ b/mysql-test/std_data/mdev5029_2.MAI diff --git a/mysql-test/std_data/mdev5029_2.frm b/mysql-test/std_data/mdev5029_2.frm Binary files differnew file mode 100644 index 00000000000..d7eb677fea7 --- /dev/null +++ b/mysql-test/std_data/mdev5029_2.frm diff --git a/mysql-test/std_data/pbxt_load_unique_error1.inc b/mysql-test/std_data/pbxt_load_unique_error1.inc deleted file mode 100644 index 998daad4144..00000000000 --- a/mysql-test/std_data/pbxt_load_unique_error1.inc +++ /dev/null @@ -1,5 +0,0 @@ -1,abc -2,def -3,ghi -3,jkl -4,opq |