diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 18:13:11 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 18:13:11 +0200 |
commit | e441c32a0be631c4f39c7337718d1d91ad721b79 (patch) | |
tree | 12076e47bed0cc1dc98a0c987e76e6cc6350b6bf /mysql-test/std_data | |
parent | fce80b6ae1e909e7ce0959650fe7b4b80a3537fd (diff) | |
parent | 8b9b4ab3f59f86e1c8f6cd6a0e6b8916db61933d (diff) | |
download | mariadb-git-e441c32a0be631c4f39c7337718d1d91ad721b79.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/std_data')
-rw-r--r-- | mysql-test/std_data/versioning/articles.frm.gz | bin | 0 -> 287 bytes |
-rw-r--r-- | mysql-test/std_data/versioning/articles2.frm.gz | bin | 0 -> 291 bytes |
-rw-r--r-- | mysql-test/std_data/versioning/ibdata1.gz | bin | 0 -> 41597 bytes |
-rw-r--r-- | mysql-test/std_data/versioning/user_stopword.frm.gz | bin | 0 -> 199 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/mysql-test/std_data/versioning/articles.frm.gz b/mysql-test/std_data/versioning/articles.frm.gz Binary files differnew file mode 100644 index 00000000000..fd3a0a8c0d4 --- /dev/null +++ b/mysql-test/std_data/versioning/articles.frm.gz diff --git a/mysql-test/std_data/versioning/articles2.frm.gz b/mysql-test/std_data/versioning/articles2.frm.gz Binary files differnew file mode 100644 index 00000000000..70f20c2e081 --- /dev/null +++ b/mysql-test/std_data/versioning/articles2.frm.gz diff --git a/mysql-test/std_data/versioning/ibdata1.gz b/mysql-test/std_data/versioning/ibdata1.gz Binary files differnew file mode 100644 index 00000000000..345217ba593 --- /dev/null +++ b/mysql-test/std_data/versioning/ibdata1.gz diff --git a/mysql-test/std_data/versioning/user_stopword.frm.gz b/mysql-test/std_data/versioning/user_stopword.frm.gz Binary files differnew file mode 100644 index 00000000000..4a17265fabb --- /dev/null +++ b/mysql-test/std_data/versioning/user_stopword.frm.gz |