diff options
| author | unknown <evgen@moonbone.local> | 2006-07-18 21:30:26 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-07-18 21:30:26 +0400 |
| commit | 5ac65c9b0812c73c12b1262c4c96d002b56c6f60 (patch) | |
| tree | b8a1526d2ca7f9d2334ece2ae6b2a748a2f19444 /sql | |
| parent | 7c88ce990310d6240854bc60a3e67aa6973f12b2 (diff) | |
| parent | d74dbf4f0dd01cab737ac95c9f6fab91287435ba (diff) | |
| download | mariadb-git-5ac65c9b0812c73c12b1262c4c96d002b56c6f60.tar.gz | |
Merge moonbone.local:/work/mysql-4.1
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
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); } |