diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-05-17 18:34:22 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-07-29 14:56:24 +0200 |
| commit | 88cbe2f08193054ccf6565c2b27a8d809285a45b (patch) | |
| tree | 8978eb8429fcaf81593a789d372babb4192e5ef2 /storage/myisammrg | |
| parent | e6cb263ef3ecc59510b62f7c7dd5dfcd78a613c7 (diff) | |
| download | mariadb-git-88cbe2f08193054ccf6565c2b27a8d809285a45b.tar.gz | |
MDEV-18496 Crash when Aria encryption is enabled but plugin not available
wait_while_table_is_used() should return an error if handler::extra() fails
Diffstat (limited to 'storage/myisammrg')
| -rw-r--r-- | storage/myisammrg/myrg_extra.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisammrg/myrg_extra.c b/storage/myisammrg/myrg_extra.c index 43dfc18c710..2b3861b9f7f 100644 --- a/storage/myisammrg/myrg_extra.c +++ b/storage/myisammrg/myrg_extra.c @@ -31,7 +31,7 @@ int myrg_extra(MYRG_INFO *info,enum ha_extra_function function, DBUG_PRINT("info",("function: %lu", (ulong) function)); if (!info->children_attached) - DBUG_RETURN(1); + DBUG_RETURN(0); if (function == HA_EXTRA_CACHE) { info->cache_in_use=1; |