diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
| commit | 2e4984c185ddcd2da789017cd147338846ff409a (patch) | |
| tree | 0293831900c860600efbaa747ea886d9d1cbf5bd /storage/perfschema/table_helper.h | |
| parent | 792b53e80806df893ee62c9a1c1bd117114c8c6d (diff) | |
| parent | a6087e7dc1ef3561d8189c8db15e9591d0f9b520 (diff) | |
| download | mariadb-git-10.0-FusionIO.tar.gz | |
Merge tag 'mariadb-10.0.20' into 10.0-FusionIO10.0-FusionIO
Conflicts:
storage/innobase/os/os0file.cc
storage/xtradb/os/os0file.cc
storage/xtradb/srv/srv0start.cc
Diffstat (limited to 'storage/perfschema/table_helper.h')
| -rw-r--r-- | storage/perfschema/table_helper.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/storage/perfschema/table_helper.h b/storage/perfschema/table_helper.h index 76bb289c73b..b1377eb9748 100644 --- a/storage/perfschema/table_helper.h +++ b/storage/perfschema/table_helper.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 2015, 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 @@ -136,9 +136,7 @@ struct PFS_digest_row /** Length in bytes of @c m_digest. */ uint m_digest_length; /** Column DIGEST_TEXT. */ - char m_digest_text[COL_DIGEST_TEXT_SIZE]; - /** Length in bytes of @c m_digest_text. */ - uint m_digest_text_length; + String m_digest_text; /** Build a row from a memory buffer. */ int make_row(PFS_statements_digest_stat*); |