diff options
| author | Marc Alff <marc.alff@sun.com> | 2009-09-10 03:18:29 -0600 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2009-09-10 03:18:29 -0600 |
| commit | 63e56390a3f1a4f80642932a790ab74f28de8010 (patch) | |
| tree | 8b611255f83ad274f072855f5acfe484a971de87 /sql/time.cc | |
| parent | 905d715f10e711860311e0a10488c6bb5e19ee49 (diff) | |
| download | mariadb-git-63e56390a3f1a4f80642932a790ab74f28de8010.tar.gz | |
WL#2110 (SIGNAL)
WL#2265 (RESIGNAL)
Manual merge of SIGNAL and RESIGNAL to mysql-trunk-signal,
plus required dependencies.
Diffstat (limited to 'sql/time.cc')
| -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 962b65e454c..810d6426a01 100644 --- a/sql/time.cc +++ b/sql/time.cc @@ -748,7 +748,7 @@ void make_truncated_value_warning(THD *thd, MYSQL_ERROR::enum_warning_level leve cs->cset->snprintf(cs, warn_buff, sizeof(warn_buff), ER(ER_TRUNCATED_WRONG_VALUE_FOR_FIELD), type_str, str.c_ptr(), field_name, - (ulong) thd->row_count); + (ulong) thd->warning_info->current_row_for_warning()); else { if (time_type > MYSQL_TIMESTAMP_ERROR) |