Commit ad3ded49 authored by Marc Alff's avatar Marc Alff

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.
parent a47998cc
...@@ -219,7 +219,7 @@ int PFS_engine_table::read_row(TABLE *table, ...@@ -219,7 +219,7 @@ int PFS_engine_table::read_row(TABLE *table,
if (! m_share_ptr->m_checked) if (! m_share_ptr->m_checked)
{ {
my_error(ER_WRONG_NATIVE_TABLE_STRUCTURE, MYF(0), 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; return HA_ERR_TABLE_NEEDS_UPGRADE;
} }
...@@ -256,7 +256,7 @@ int PFS_engine_table::update_row(TABLE *table, ...@@ -256,7 +256,7 @@ int PFS_engine_table::update_row(TABLE *table,
if (! m_share_ptr->m_checked) if (! m_share_ptr->m_checked)
{ {
my_error(ER_WRONG_NATIVE_TABLE_STRUCTURE, MYF(0), 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; return HA_ERR_TABLE_NEEDS_UPGRADE;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment