Commit 42cb4005 authored by Marko Mäkelä's avatar Marko Mäkelä

Merge 10.5 into 10.6

parents 2a4bba27 97d82808
Branches unavailable
Tags unavailable
No related merge requests found
...@@ -465,7 +465,7 @@ class ha_innobase final : public handler ...@@ -465,7 +465,7 @@ class ha_innobase final : public handler
/* @return true if it's necessary to switch current statement log /* @return true if it's necessary to switch current statement log
format from STATEMENT to ROW if binary log format is MIXED and format from STATEMENT to ROW if binary log format is MIXED and
autoincrement values are changed in the statement */ autoincrement values are changed in the statement */
bool autoinc_lock_mode_stmt_unsafe() const; bool autoinc_lock_mode_stmt_unsafe() const override;
dict_index_t* innobase_get_index(uint keynr); dict_index_t* innobase_get_index(uint keynr);
#ifdef WITH_WSREP #ifdef WITH_WSREP
......
/* Copyright (C) 2019 MariaDB Corporation AB /* Copyright (C) 2019, 2022, MariaDB Corporation AB
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
...@@ -20,17 +20,17 @@ ...@@ -20,17 +20,17 @@
in myisamchk.h in myisamchk.h
*/ */
typedef struct st_sort_key_blocks /* Used when sorting */ struct st_sort_key_blocks /* Used when sorting */
{ {
uchar *buff, *end_pos; uchar *buff, *end_pos;
uchar lastkey[MARIA_MAX_POSSIBLE_KEY_BUFF]; uchar lastkey[MARIA_MAX_POSSIBLE_KEY_BUFF];
uint last_length; uint last_length;
int inited; int inited;
} MA_SORT_KEY_BLOCKS; };
typedef struct st_sort_ftbuf struct st_sort_ftbuf
{ {
uchar *buf, *end; uchar *buf, *end;
int count; int count;
uchar lastkey[MARIA_MAX_KEY_BUFF]; uchar lastkey[MARIA_MAX_KEY_BUFF];
} MA_SORT_FT_BUF; };
...@@ -150,21 +150,21 @@ struct st_maria_share; ...@@ -150,21 +150,21 @@ struct st_maria_share;
struct st_maria_handler; /* For referense */ struct st_maria_handler; /* For referense */
struct st_maria_keydef; struct st_maria_keydef;
typedef struct st_maria_key /* Internal info about a key */ struct st_maria_key /* Internal info about a key */
{ {
uchar *data; /* Data for key */ uchar *data; /* Data for key */
struct st_maria_keydef *keyinfo; /* Definition for key */ struct st_maria_keydef *keyinfo; /* Definition for key */
uint data_length; /* Length of key data */ uint data_length; /* Length of key data */
uint ref_length; /* record ref + transid */ uint ref_length; /* record ref + transid */
uint32 flag; /* 0 or SEARCH_PART_KEY */ uint32 flag; /* 0 or SEARCH_PART_KEY */
} MARIA_KEY; };
typedef struct st_maria_decode_tree /* Decode huff-table */ struct st_maria_decode_tree /* Decode huff-table */
{ {
uint16 *table; uint16 *table;
uint quick_table_bits; uint quick_table_bits;
uchar *intervalls; uchar *intervalls;
} MARIA_DECODE_TREE; };
typedef struct s3_info S3_INFO; typedef struct s3_info S3_INFO;
......
#ifndef S3_FUNC_INCLUDED #ifndef S3_FUNC_INCLUDED
#define S3_FUNC_INCLUDED #define S3_FUNC_INCLUDED
/* Copyright (C) 2019, 2020 MariaDB Corporation Ab /* Copyright (C) 2019, 2022, MariaDB Corporation Ab
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
...@@ -41,7 +41,7 @@ extern TYPELIB s3_protocol_typelib; ...@@ -41,7 +41,7 @@ extern TYPELIB s3_protocol_typelib;
/* Store information about a s3 connection */ /* Store information about a s3 connection */
typedef struct s3_info struct s3_info
{ {
/* Connection strings */ /* Connection strings */
LEX_CSTRING access_key, secret_key, region, bucket, host_name; LEX_CSTRING access_key, secret_key, region, bucket, host_name;
...@@ -63,7 +63,7 @@ typedef struct s3_info ...@@ -63,7 +63,7 @@ typedef struct s3_info
/* Protocol for the list bucket API call. 1 for Amazon, 2 for some others */ /* Protocol for the list bucket API call. 1 for Amazon, 2 for some others */
uint8_t protocol_version; uint8_t protocol_version;
} S3_INFO; };
/* flag + length is stored in this header */ /* flag + length is stored in this header */
......
/* /*
Copyright (c) 2000, 2012, Oracle and/or its affiliates. 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 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 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 */ ...@@ -613,21 +613,21 @@ typedef struct st_mi_block_info /* Parameter to _mi_get_block_info */
} MI_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 *buff, *end_pos;
uchar lastkey[HA_MAX_POSSIBLE_KEY_BUFF]; uchar lastkey[HA_MAX_POSSIBLE_KEY_BUFF];
uint last_length; uint last_length;
int inited; int inited;
} SORT_KEY_BLOCKS; };
typedef struct st_sort_ftbuf struct st_sort_ftbuf
{ {
uchar *buf, *end; uchar *buf, *end;
int count; int count;
uchar lastkey[HA_MAX_KEY_BUFF]; uchar lastkey[HA_MAX_KEY_BUFF];
} SORT_FT_BUF; };
/* bits in return from _mi_get_block_info */ /* bits in return from _mi_get_block_info */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment