diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-20 10:26:49 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-20 10:41:32 +0200 |
| commit | 514b305dfb2839c619a623bbdae5f21cf0077672 (patch) | |
| tree | 2f9700f05ccf0ddc7e46a547d9a191404e8dbbd7 /storage/spider/ha_spider.cc | |
| parent | de51acd03730311505677eb7212756e7126183b3 (diff) | |
| parent | 117291db8b35ddb4cd8c89ee4d8de888160b7163 (diff) | |
| download | mariadb-git-514b305dfb2839c619a623bbdae5f21cf0077672.tar.gz | |
Merge 10.3 into 10.4
The MDEV-17262 commit 26432e49d37a37d09b862bb49a021e44bdf4789c
was skipped. In Galera 4, the implementation would seem to require
changes to the streaming replication.
In the tests archive.rnd_pos main.profiling, disable_ps_protocol
for SHOW STATUS and SHOW PROFILE commands until MDEV-18974
has been fixed.
Diffstat (limited to 'storage/spider/ha_spider.cc')
| -rw-r--r-- | storage/spider/ha_spider.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc index cc97a19988d..c892bd8828c 100644 --- a/storage/spider/ha_spider.cc +++ b/storage/spider/ha_spider.cc @@ -11295,7 +11295,7 @@ int ha_spider::create( error_num = ER_SPIDER_ALTER_BEFORE_UNLOCK_NUM; goto error_alter_before_unlock; } - memset(&tmp_share, 0, sizeof(SPIDER_SHARE)); + memset((void*)&tmp_share, 0, sizeof(SPIDER_SHARE)); tmp_share.table_name = (char*) name; tmp_share.table_name_length = strlen(name); #ifdef SPIDER_HAS_HASH_VALUE_TYPE |