diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-06 12:36:25 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-06 12:36:25 +0200 |
| commit | eb1a9d11f0e075a7cc241bd31795005edab091e4 (patch) | |
| tree | 276b6a5b12b2786b3eb7b6ecf81b3d0831b604ba /sql/set_var.cc | |
| parent | 9cd171e2dc8743f96c710039e7348426e9bff045 (diff) | |
| parent | b5b5e902afce341b8aba7828cb594200647f3a10 (diff) | |
| download | mariadb-git-eb1a9d11f0e075a7cc241bd31795005edab091e4.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index d0268d7017b..df0c69260e7 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -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; } |