diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-11 13:35:35 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-11 13:35:35 +0200 |
| commit | 42cb400562a24b434f1afba15db60c0262d4f084 (patch) | |
| tree | 8d467462fa022ff1105bb76eabb1364c57b2cb66 /storage/myisam | |
| parent | 2a4bba27431a047c9fb3d6953d96d5c623a6ccfe (diff) | |
| parent | 97d82808b81b08972a872d5aeeeac5a5a3e954c5 (diff) | |
| download | mariadb-git-42cb400562a24b434f1afba15db60c0262d4f084.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/myisamdef.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/myisam/myisamdef.h b/storage/myisam/myisamdef.h index f48d1078000..c90d989c975 100644 --- a/storage/myisam/myisamdef.h +++ b/storage/myisam/myisamdef.h @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2012, Oracle and/or its affiliates. - Copyright (c) 2017, MariaDB Corporation. + Copyright (c) 2017, 2022, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -613,21 +613,21 @@ typedef struct st_mi_block_info /* Parameter to _mi_get_block_info */ } MI_BLOCK_INFO; -typedef struct st_sort_key_blocks /* Used when sorting */ +struct st_sort_key_blocks /* Used when sorting */ { uchar *buff, *end_pos; uchar lastkey[HA_MAX_POSSIBLE_KEY_BUFF]; uint last_length; int inited; -} SORT_KEY_BLOCKS; +}; -typedef struct st_sort_ftbuf +struct st_sort_ftbuf { uchar *buf, *end; int count; uchar lastkey[HA_MAX_KEY_BUFF]; -} SORT_FT_BUF; +}; /* bits in return from _mi_get_block_info */ |