diff options
| author | Daniel Black <daniel@mariadb.org> | 2021-05-19 14:56:09 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2021-12-16 10:53:32 +1100 |
| commit | 2776635cb98d35867447d375fdc04a44ef11a697 (patch) | |
| tree | 23d76c965568951cb62f4de59a1dbf45df968e91 /storage/maria | |
| parent | 03678bcf55bf8a813a1d81c021d2ae085750aee2 (diff) | |
| download | mariadb-git-2776635cb98d35867447d375fdc04a44ef11a697.tar.gz | |
MDEV-24788: mariadbd --help Can't lock aria control file
... '/var/lib/mysql/aria_log_control' for exclusive use, error: 11
As such don't lock under aria_readonly (which is set by opt_help in the handler
initialization.
Fixes: 8eba777c2bbad7721c818936a3a0ced3b2fcd59c
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/ma_control_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/maria/ma_control_file.c b/storage/maria/ma_control_file.c index 65b8b0922aa..af1708c72b2 100644 --- a/storage/maria/ma_control_file.c +++ b/storage/maria/ma_control_file.c @@ -314,7 +314,7 @@ CONTROL_FILE_ERROR ma_control_file_open(my_bool create_if_missing, errmsg= "Can't create file"; goto err; } - if (lock_control_file(name, wait_for_lock)) + if (!aria_readonly && lock_control_file(name, wait_for_lock)) { error= CONTROL_FILE_LOCKED; errmsg= lock_failed_errmsg; @@ -332,7 +332,7 @@ CONTROL_FILE_ERROR ma_control_file_open(my_bool create_if_missing, } /* lock it before reading content */ - if (lock_control_file(name, wait_for_lock)) + if (!aria_readonly && lock_control_file(name, wait_for_lock)) { error= CONTROL_FILE_LOCKED; errmsg= lock_failed_errmsg; |