diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-01-04 19:54:42 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-01-04 19:54:42 +0200 |
| commit | d2f7348fdcb47a4fab6d3904143272f25535b5f0 (patch) | |
| tree | d558e2e1bf43b20173bfdba5567a073c667a002c /sql/sql_class.cc | |
| parent | 08b84df418c8c99e3b8db367b35135a3da2ffdd7 (diff) | |
| parent | 7ae95fdef2b5d4880d381d6ed46ad4aa996b03d3 (diff) | |
| download | mariadb-git-d2f7348fdcb47a4fab6d3904143272f25535b5f0.tar.gz | |
Merge with 5.1
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 83108f58c68..8b23af4de37 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -2170,7 +2170,7 @@ bool select_export::send_data(List<Item> &items) ER_TRUNCATED_WRONG_VALUE_FOR_FIELD, ER(ER_TRUNCATED_WRONG_VALUE_FOR_FIELD), "string", printable_buff, - item->name, row_count); + item->name, (ulong) row_count); } cvt_str.length(bytes); res= &cvt_str; |