database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge with 5.1

Browse Source
This commit is contained in:
Michael Widenius
2010-01-04 19:54:42 +02:00
parent 08b84df418 7ae95fdef2
commit d2f7348fdc
134 changed files with 3195 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.cc
View File

@@ -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;