mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

5.6.32

Browse source
This commit is contained in:
Sergei Golubchik 2016-08-10 19:26:54 +02:00
parent 51ed64a520
commit 0d8bb019b6
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
storage/perfschema/table_events_statements.cc
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
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
@ -340,11 +340,17 @@ void table_events_statements_common::make_row_part_1(PFS_events_statements *stat
CHARSET_INFO *cs= get_charset(statement->m_sqltext_cs_number, MYF(0));
size_t valid_length= statement->m_sqltext_length;
if (cs->mbmaxlen > 1)
if (cs != NULL)
{
int well_formed_error;
valid_length= cs->cset->well_formed_len(cs, statement->m_sqltext, statement->m_sqltext + valid_length,
valid_length, &well_formed_error);
if (cs->mbmaxlen > 1)
{
int well_formed_error;
valid_length= cs->cset->well_formed_len(cs,
statement->m_sqltext,
statement->m_sqltext + valid_length,
valid_length,
&well_formed_error);
}
}
m_row.m_sqltext.set_charset(cs);