diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 13:41:29 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 13:41:29 +0200 |
| commit | c32f71af7e4b747de223bf6b44e691941f5997cf (patch) | |
| tree | 03270b9a849e165f1c8605102ee06bced2331477 /sql/encryption.cc | |
| parent | 4d41f316c3c1c05fdd35cbdc1b626d596b89af40 (diff) | |
| parent | 555c6632c69d707cc1641ef396e7b66a65f14bdc (diff) | |
| download | mariadb-git-c32f71af7e4b747de223bf6b44e691941f5997cf.tar.gz | |
Merge branch '10.2' into 10.3
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 fc07623883e..493d72ae346 100644 --- a/sql/encryption.cc +++ b/sql/encryption.cc @@ -75,8 +75,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; |