1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Automerge with 5.2

This commit is contained in:
Michael Widenius
2010-11-05 12:37:51 +02:00
57 changed files with 910 additions and 319 deletions

View File

@ -1313,6 +1313,13 @@ public:
return m_total_warn_count;
}
/* Used to count any warnings pushed after calling set_ok_status(). */
void increment_warning()
{
if (m_status != DA_EMPTY)
m_total_warn_count++;
}
Diagnostics_area() { reset_diagnostics_area(); }
private: