database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fixed bugs found by valgrind

Browse Source 
Other things:
- Removed innodb_encryption_tables.test from valgrind as it
  takes a REALLY long time
This commit is contained in:
Monty
2020-05-15 10:44:05 +03:00
parent 1b16572074
commit 277aa85c9b
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/encryption/t/innodb_encryption_tables.test
View File

@@ -1,6 +1,8 @@
-- source include/have_innodb.inc -- source include/have_innodb.inc
-- source include/have_example_key_management_plugin.inc -- source include/have_example_key_management_plugin.inc
-- source include/not_embedded.inc -- source include/not_embedded.inc
# We can't run this test under valgrind as it 'takes forever'
-- source include/not_valgrind.inc
create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb; create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact; create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact;

2
sql/field.cc
View File

@@ -1438,7 +1438,7 @@ void Field::error_generated_column_function_is_not_allowed(THD *thd,
QT_ITEM_IDENT_SKIP_TABLE_NAMES)); QT_ITEM_IDENT_SKIP_TABLE_NAMES));
my_error(ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED, my_error(ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED,
MYF(error ? 0 : ME_JUST_WARNING), MYF(error ? 0 : ME_JUST_WARNING),
tmp.c_ptr(), vcol_info->get_vcol_type_name(), tmp.c_ptr_safe(), vcol_info->get_vcol_type_name(),
const_cast<const char*>(field_name)); const_cast<const char*>(field_name));
} }

2
sql/log_event.cc
View File

@@ -10228,6 +10228,8 @@ const char *sql_ex_info::init(const char *buf, const char *buf_end,
} }
else else
{ {
if (buf_end - buf < 7)
return 0; // Wrong data
field_term_len= enclosed_len= line_term_len= line_start_len= escaped_len=1; field_term_len= enclosed_len= line_term_len= line_start_len= escaped_len=1;
field_term = buf++; // Use first byte in string field_term = buf++; // Use first byte in string
enclosed= buf++; enclosed= buf++;