summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index d0268d7017b..55c62a9a5a5 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -804,7 +804,7 @@ sys_var *sys_variables[]=
/*
- Variables shown by SHOW variables in alphabetical order
+ Variables shown by SHOW VARIABLES in alphabetical order
*/
struct show_var_st init_vars[]= {
@@ -2927,6 +2927,7 @@ static byte *get_warning_count(THD *thd)
{
thd->sys_var_tmp.long_value=
(thd->warn_count[(uint) MYSQL_ERROR::WARN_LEVEL_NOTE] +
+ thd->warn_count[(uint) MYSQL_ERROR::WARN_LEVEL_ERROR] +
thd->warn_count[(uint) MYSQL_ERROR::WARN_LEVEL_WARN]);
return (byte*) &thd->sys_var_tmp.long_value;
}