1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#50478 perfschema.tampered_perfschema_table1 fails sporadically on

Browse Source 
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.
This commit is contained in:
Marc Alff 2010-01-22 17:15:16 -07:00
parent a47998cccc
commit ad3ded4990
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/perfschema/pfs_engine_table.cc
View File

@ -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,
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;
} }