diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
| commit | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch) | |
| tree | bdf0738c29dc1f57fbfba3a1754524e238f15b52 /sql/sql_error.h | |
| parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
| download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz | |
lots of post-merge changes
Diffstat (limited to 'sql/sql_error.h')
| -rw-r--r-- | sql/sql_error.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_error.h b/sql/sql_error.h index c0f28c20286..8495a8cfa57 100644 --- a/sql/sql_error.h +++ b/sql/sql_error.h @@ -101,7 +101,7 @@ public: void increment_warning() { if (m_status != DA_EMPTY) - m_total_warn_count++; + m_statement_warn_count++; } Diagnostics_area() { reset_diagnostics_area(); } |