database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Merge branch '13.0' into 13.1

Browse Source
This commit is contained in:
Oleksandr Byelkin
2026-09-04 12:21:02 +02:00
parent b2a8c2234d ba0d134749
commit b140f801e6
528 changed files with 15646 additions and 2935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/auth_mysql_sha2/mysql-test/mysql_sha2/ssl_auto.result
View File

@@ -23,7 +23,7 @@ test2@localhost test2@% 1
# mysql -utest2 -ppwd --disable-ssl-verify-server-cert -e "call test.checkme()"
ERROR 1045 (28000): Access denied for user 'test2'@'localhost' (using password: YES)
# mysql -utest1 -ppwd --ssl-verify-server-cert -e "call test.checkme()"
ERROR 2026 (HY000): TLS/SSL error: Certificate verification failure: The certificate is NOT trusted.
ERROR 2026 (HY000): TLS/SSL error: Failed to verify the server certificate
drop procedure checkme;
drop user test1@'%';
drop user test2@'%';

2
plugin/file_key_management/parser.cc
View File

@@ -127,7 +127,7 @@ bool Parser::read_filekey(const char *filekey, char *secret)
}
close(f);
while (secret[len - 1] == '\r' || secret[len - 1] == '\n') len--;
while (len && (secret[len - 1] == '\r' || secret[len - 1] == '\n')) len--;
if (len > MAX_SECRET_SIZE)
{
my_printf_error(EE_READ,

1
plugin/qc_info/qc_info.cc
View File

@@ -233,6 +233,7 @@ static int qc_info_fill_table(THD *thd, TABLE_LIST *tables,
compile_time_assert(QUERY_CACHE_DB_LENGTH_SIZE == 2);
db= key + statement_text_length + 1 + QUERY_CACHE_DB_LENGTH_SIZE;
db_length= uint2korr(db - QUERY_CACHE_DB_LENGTH_SIZE);
set_if_smaller(db_length, (size_t)(key + key_length - QUERY_CACHE_FLAGS_SIZE - db));
table->field[COLUMN_STATEMENT_SCHEMA]->store(db, db_length, scs);

2
plugin/type_cursor/plugin.cc
View File

@@ -185,7 +185,7 @@ class Field_sys_refcursor final :public Field_short,
DBUG_RETURN(false); // Weak cursor (no RETURN clause)
sp_cursor *sc= ref < thd->statement_cursors()->size() ?
&thd->statement_cursors()->at(ref) :
thd->statement_cursors()->at(ref) :
nullptr;
if (!sc)
{

8
plugin/type_mysql_json/mysql_json.cc
View File

@@ -373,7 +373,8 @@ static bool parse_mysql_scalar_or_value(String *buffer, const uchar *data,
if (type_is_stored_inline(value_type, large))
{
const size_t value_start = value_type_offset + 1;
if (parse_mysql_scalar(buffer, value_type, data + value_start,
if (value_start >= len ||
parse_mysql_scalar(buffer, value_type, data + value_start,
len - value_start))
return true;
}
@@ -383,7 +384,8 @@ static bool parse_mysql_scalar_or_value(String *buffer, const uchar *data,
of the Object / Array */
const size_t value_start= read_offset_or_size(
data + value_type_offset + 1, large);
if (parse_mysql_json_value(buffer, value_type, data + value_start,
if (value_start >= len ||
parse_mysql_json_value(buffer, value_type, data + value_start,
len - value_start, depth))
return true;
}
@@ -453,7 +455,7 @@ static bool parse_array_or_object(String *buffer, const uchar *data, size_t len,
i * value_size(large));
/* First print the key. */
if (buffer->append('"') ||
if (key_start + key_len > bytes || buffer->append('"') ||
append_string_json(buffer, data + key_start, key_len) ||
buffer->append(STRING_WITH_LEN("\": ")))
{

4
plugin/wsrep_info/mysql-test/wsrep_info/my.cnf
View File

@@ -26,6 +26,10 @@ wsrep_provider_options='base_port=@mysqld.2.#galera_port'
wsrep_sst_receive_address='127.0.0.1:@mysqld.2.#sst_port'
wsrep_node_name=test-node-2
[sst]
# SSL mode is disabled for SST unless tests specifically enable it.
ssl-mode=DISABLED
[ENV]
NODE_MYPORT_1= @mysqld.1.port
NODE_MYSOCK_1= @mysqld.1.socket