diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 14:44:06 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 14:44:06 +0200 |
| commit | 57325e470615e79f674d82b2d5b09f609508fc6a (patch) | |
| tree | 7a2e84a6753a5a5592f44f96194ad7a551c4669f /sql/encryption.cc | |
| parent | 706a7101bfacd29f4f5728034be92240e82df583 (diff) | |
| parent | c32f71af7e4b747de223bf6b44e691941f5997cf (diff) | |
| download | mariadb-git-57325e470615e79f674d82b2d5b09f609508fc6a.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/encryption.cc')
| -rw-r--r-- | sql/encryption.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/encryption.cc b/sql/encryption.cc index 9c38713fdfa..13239b91910 100644 --- a/sql/encryption.cc +++ b/sql/encryption.cc @@ -78,8 +78,8 @@ int initialize_encryption_plugin(st_plugin_int *plugin) (struct st_mariadb_encryption*) plugin->plugin->info; /* - Copmiler on Spark doesn't like the '?' operator here as it - belives the (uint (*)...) implies the C++ call model. + Compiler on Spark doesn't like the '?' operator here as it + believes the (uint (*)...) implies the C++ call model. */ if (handle->crypt_ctx_size) encryption_handler.encryption_ctx_size_func= handle->crypt_ctx_size; |