diff options
| author | Marc Alff <marc.alff@sun.com> | 2010-01-22 17:15:16 -0700 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2010-01-22 17:15:16 -0700 |
| commit | ad3ded49906838d9e49bf914d95cf947d49a6b34 (patch) | |
| tree | fdba086257e0eb6677205a347c2663e105abd6cf /storage/perfschema | |
| parent | a47998cccc1e35c18f422c1ee6c6a8f48e78b533 (diff) | |
| download | mariadb-git-ad3ded49906838d9e49bf914d95cf947d49a6b34.tar.gz | |
Bug#50478 perfschema.tampered_perfschema_table1 fails sporadically on
Windows and Solaris
Reviewed every call to my_error() using the va_args parameters,
to make sure the arguments type are ok.
Fixed the broken calls to my_error() to pass a strings as 'char *',
not LEX_STRING.
Diffstat (limited to 'storage/perfschema')
| -rw-r--r-- | storage/perfschema/pfs_engine_table.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/perfschema/pfs_engine_table.cc b/storage/perfschema/pfs_engine_table.cc index 4190094b52b..8fe51e8c410 100644 --- a/storage/perfschema/pfs_engine_table.cc +++ b/storage/perfschema/pfs_engine_table.cc @@ -219,7 +219,7 @@ int PFS_engine_table::read_row(TABLE *table, if (! m_share_ptr->m_checked) { my_error(ER_WRONG_NATIVE_TABLE_STRUCTURE, MYF(0), - PERFORMANCE_SCHEMA_str.str, m_share_ptr->m_name); + PERFORMANCE_SCHEMA_str.str, m_share_ptr->m_name.str); return HA_ERR_TABLE_NEEDS_UPGRADE; } @@ -256,7 +256,7 @@ int PFS_engine_table::update_row(TABLE *table, if (! m_share_ptr->m_checked) { my_error(ER_WRONG_NATIVE_TABLE_STRUCTURE, MYF(0), - PERFORMANCE_SCHEMA_str.str, m_share_ptr->m_name); + PERFORMANCE_SCHEMA_str.str, m_share_ptr->m_name.str); return HA_ERR_TABLE_NEEDS_UPGRADE; } |