diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
| commit | 65ca700def99289cc31a7040537f5aa6e12bf485 (patch) | |
| tree | 97b3a07299b626c519da0e80c122b5b79b933914 /sql/sql_error.cc | |
| parent | 2ab57de38d13d927ddff2d51aed4af34e13998f5 (diff) | |
| parent | 6e5bcca7935d3c62f84bb640e5357664a210ee12 (diff) | |
| download | mariadb-git-65ca700def99289cc31a7040537f5aa6e12bf485.tar.gz | |
merge.
checkpoint.
does not compile.
Diffstat (limited to 'sql/sql_error.cc')
| -rw-r--r-- | sql/sql_error.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc index 8c038e10a1f..44bfe0a4f44 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -591,6 +591,9 @@ void push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, (void) thd->raise_condition(code, NULL, level, msg); + /* Make sure we also count warnings pushed after calling set_ok_status(). */ + thd->stmt_da->increment_warning(); + DBUG_VOID_RETURN; } |