diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2008-11-10 20:32:45 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2008-11-10 20:32:45 +0100 |
| commit | a1e2d2d14615b0ccac6b1246a58cd347effaeefb (patch) | |
| tree | 0c6bedc8298d6ba68c23420c95626e2b52466499 /sql/sql_error.cc | |
| parent | 12ad7f3b9da5e0563c24698856102b4b646cea82 (diff) | |
| parent | 9a0637750a4775e199b3915bd83e630540729d64 (diff) | |
| download | mariadb-git-a1e2d2d14615b0ccac6b1246a58cd347effaeefb.tar.gz | |
Merge main 5.1 -> 5.1-build
Diffstat (limited to 'sql/sql_error.cc')
| -rw-r--r-- | sql/sql_error.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc index 0b74e3455eb..79da1936eb9 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -109,6 +109,9 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, DBUG_ENTER("push_warning"); DBUG_PRINT("enter", ("code: %d, msg: %s", code, msg)); + DBUG_ASSERT(code != 0); + DBUG_ASSERT(msg != NULL); + if (level == MYSQL_ERROR::WARN_LEVEL_NOTE && !(thd->options & OPTION_SQL_NOTES)) DBUG_RETURN(0); @@ -177,7 +180,10 @@ void push_warning_printf(THD *thd, MYSQL_ERROR::enum_warning_level level, char warning[ERRMSGSIZE+20]; DBUG_ENTER("push_warning_printf"); DBUG_PRINT("enter",("warning: %u", code)); - + + DBUG_ASSERT(code != 0); + DBUG_ASSERT(format != NULL); + va_start(args,format); my_vsnprintf(warning, sizeof(warning), format, args); va_end(args); |