diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-27 16:17:02 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-27 16:17:02 +0300 |
| commit | 773f1dad94add6db4d61bcbc66398fd61be33149 (patch) | |
| tree | f7fbfc48a5e061e74f20eaaff001837ee8939b2c /storage | |
| parent | ea847cbeaf76817aab8817f849e80e8ce8b2b43c (diff) | |
| parent | b922ae5fc938caccd59f09c8e4825431cd01bc30 (diff) | |
| download | mariadb-git-773f1dad94add6db4d61bcbc66398fd61be33149.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/buf/buf0buf.cc | 5 | ||||
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index e630186aa4e..72f7e795bc9 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -980,10 +980,13 @@ buf_madvise_do_dump() } #endif +#ifndef UNIV_DEBUG static inline byte hex_to_ascii(byte hex_digit) { - return hex_digit <= 9 ? '0' + hex_digit : ('a' - 10) + hex_digit; + const int offset= hex_digit <= 9 ? '0' : 'a' - 10; + return byte(hex_digit + offset); } +#endif /** Dump a page to stderr. @param[in] read_buf database page diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 4c44abae0d7..30a116a6cc5 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -6196,8 +6196,10 @@ prepare_inplace_alter_table_dict( /* If we promised ALGORITHM=NOCOPY or ALGORITHM=INSTANT, we must retain the original ROW_FORMAT of the table. */ flags = (user_table->flags & (DICT_TF_MASK_COMPACT + | DICT_TF_MASK_ZIP_SSIZE | DICT_TF_MASK_ATOMIC_BLOBS)) | (flags & ~(DICT_TF_MASK_COMPACT + | DICT_TF_MASK_ZIP_SSIZE | DICT_TF_MASK_ATOMIC_BLOBS)); } |