diff options
| author | unknown <cmiller@zippy.(none)> | 2006-07-11 14:25:42 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-07-11 14:25:42 -0400 |
| commit | 26ddd5cb0c2f93f39f05f89b642642fb2c79f5d0 (patch) | |
| tree | a0ca851c164dde7e6c6f20c2aec3d04aee0cbf3b /sql | |
| parent | 665db1a6ade28cc7c6152a7411badbc822792331 (diff) | |
| parent | ed001f18a49301f51cab3e3e5d5c9ade212bd19f (diff) | |
| download | mariadb-git-26ddd5cb0c2f93f39f05f89b642642fb2c79f5d0.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/time.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/time.cc b/sql/time.cc index e76b169b336..ef832ac5a70 100644 --- a/sql/time.cc +++ b/sql/time.cc @@ -797,7 +797,7 @@ void make_truncated_value_warning(THD *thd, const char *str_val, } sprintf(warn_buff, ER(ER_TRUNCATED_WRONG_VALUE), type_str, str.ptr()); - push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_TRUNCATED_WRONG_VALUE, warn_buff); } |