diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-04-05 15:47:09 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-06-08 17:13:51 +1000 |
| commit | e8b0894dc8d8db630f7faf56c68138d6e39d7cdc (patch) | |
| tree | 702e6ce266bcaba80cab8a2a7b4e9326c2b21359 /storage | |
| parent | 4834a0d1fa683ae9cf786368efedc72e64dfbfe0 (diff) | |
| download | mariadb-git-e8b0894dc8d8db630f7faf56c68138d6e39d7cdc.tar.gz | |
MDEV-28243: AIX missing my_gethwaddr implementation
and failing spider partition test.
With some small datatype changes to the Linux/Solaris my_gethwaddr implementation
the hardware address of AIX can be returned. This is an important aspect
in Spider (and UUID).
Spider test change reviewed by Nayuta Yanagisawa.
my_gethwaddr review by Monty in #2081
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/spider/mysql-test/spider/t/partition_mrr.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/spider/mysql-test/spider/t/partition_mrr.test b/storage/spider/mysql-test/spider/t/partition_mrr.test index 2816d65cadb..710e2781242 100644 --- a/storage/spider/mysql-test/spider/t/partition_mrr.test +++ b/storage/spider/mysql-test/spider/t/partition_mrr.test @@ -179,21 +179,21 @@ if ($USE_CHILD_GROUP2) --connection child2_1 if ($USE_GENERAL_LOG) { ---replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/ +--replace_regex /tmp_spider_bka_(0x)?[0-9a-f]*/tmp_spider_bka_xxxx/ eval $CHILD2_1_SELECT_ARGUMENT1; } eval $CHILD2_1_SELECT_TABLES; --connection child2_2 if ($USE_GENERAL_LOG) { ---replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/ +--replace_regex /tmp_spider_bka_(0x)?[0-9a-f]*/tmp_spider_bka_xxxx/ eval $CHILD2_2_SELECT_ARGUMENT1; } eval $CHILD2_2_SELECT_TABLES; --connection child2_3 if ($USE_GENERAL_LOG) { ---replace_regex /tmp_spider_bka_0x[0-9a-f]*/tmp_spider_bka_xxxx/ +--replace_regex /tmp_spider_bka_(0x)?[0-9a-f]*/tmp_spider_bka_xxxx/ eval $CHILD2_3_SELECT_ARGUMENT1; } eval $CHILD2_3_SELECT_TABLES; |