diff options
| author | Guilhem Bichot <guilhem.bichot@oracle.com> | 2011-05-21 10:21:08 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem.bichot@oracle.com> | 2011-05-21 10:21:08 +0200 |
| commit | 12f651ac9ddfb21187c69ae7a50c72440f7025c8 (patch) | |
| tree | 43fd6afdae9f8879ad4cdbb000497fee7cba02f4 /sql/sql_class.cc | |
| parent | de91727eec494adc8d8dbee4a83fe8a6f1f93c39 (diff) | |
| parent | 25221cccd2dde986c91c1ad3bdca3ee2869ed2ac (diff) | |
| download | mariadb-git-12f651ac9ddfb21187c69ae7a50c72440f7025c8.tar.gz | |
Merge from 5.1.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 4af038bb4e0..1780d1b6a13 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -11,7 +11,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + /***************************************************************************** ** @@ -2191,7 +2192,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, static_cast<long>(row_count)); } else if (from_end_pos < res->ptr() + res->length()) { @@ -2200,7 +2201,7 @@ bool select_export::send_data(List<Item> &items) */ push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, ER(WARN_DATA_TRUNCATED), - item->full_name(), row_count); + item->full_name(), static_cast<long>(row_count)); } cvt_str.length(bytes); res= &cvt_str; |