diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-06-15 18:32:08 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-06-15 18:32:08 +0300 |
| commit | 5f1f2fc0e443f098af24d21f7d1ec1a8166a4030 (patch) | |
| tree | 7b870d0c390c05d6629f4813966e740ea073fcef /sql/set_var.cc | |
| parent | 3143ad589a24ac7581e2195ba0dc13576cb3c9da (diff) | |
| download | mariadb-git-5f1f2fc0e443f098af24d21f7d1ec1a8166a4030.tar.gz | |
Applied all changes from Igor and Sanja
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 9f5404d75ce..c808e2dc11c 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -279,7 +279,7 @@ void sys_var::do_deprecated_warning(THD *thd) ? ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT : ER_WARN_DEPRECATED_SYNTAX; if (thd) - push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, ER_WARN_DEPRECATED_SYNTAX, ER(errmsg), buf1, deprecation_substitute); else @@ -316,7 +316,7 @@ bool throw_bounds_warning(THD *thd, const char *name, my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), name, buf); return true; } - push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, ER_TRUNCATED_WRONG_VALUE, ER(ER_TRUNCATED_WRONG_VALUE), name, buf); } @@ -336,7 +336,7 @@ bool throw_bounds_warning(THD *thd, const char *name, bool fixed, double v) my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), name, buf); return true; } - push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, ER_TRUNCATED_WRONG_VALUE, ER(ER_TRUNCATED_WRONG_VALUE), name, buf); } |