diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-08-10 19:44:28 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-08-10 19:44:28 +0200 |
| commit | e672d3fb326f717c9e9d26f9bf79ea84ce022e6e (patch) | |
| tree | 79406c62132a9d778698f64f55630f19bde89541 /storage/perfschema | |
| parent | 57fbc603bf1e7e615f8620d9a1b18f4bf13ee945 (diff) | |
| parent | 0d8bb019b690894fde0f00cbd931aa023778ee48 (diff) | |
| download | mariadb-git-e672d3fb326f717c9e9d26f9bf79ea84ce022e6e.tar.gz | |
Merge branch 'merge/merge-perfschema-5.6' into 10.0
5.6.32
Diffstat (limited to 'storage/perfschema')
| -rw-r--r-- | storage/perfschema/ha_perfschema.cc | 2 | ||||
| -rw-r--r-- | storage/perfschema/table_events_statements.cc | 16 |
2 files changed, 12 insertions, 6 deletions
diff --git a/storage/perfschema/ha_perfschema.cc b/storage/perfschema/ha_perfschema.cc index 6c69594b91a..444de87ba8b 100644 --- a/storage/perfschema/ha_perfschema.cc +++ b/storage/perfschema/ha_perfschema.cc @@ -205,7 +205,7 @@ maria_declare_plugin(perfschema) 0x0001, pfs_status_vars, NULL, - "5.6.29", + "5.6.32", MariaDB_PLUGIN_MATURITY_STABLE } maria_declare_plugin_end; diff --git a/storage/perfschema/table_events_statements.cc b/storage/perfschema/table_events_statements.cc index c9d35540e21..36ff10c400a 100644 --- a/storage/perfschema/table_events_statements.cc +++ b/storage/perfschema/table_events_statements.cc @@ -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); |