diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-12-04 17:12:22 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-12-04 17:12:22 +0200 |
| commit | d8e44ef589964a7afc28ffd7c1398be168a9d693 (patch) | |
| tree | f814db32e6d16f2b471eec465a750874cf496106 /sql/sql_class.cc | |
| parent | 9aafd0dae2e9302b7af877f1670b5dc7360a7daf (diff) | |
| download | mariadb-git-d8e44ef589964a7afc28ffd7c1398be168a9d693.tar.gz | |
Fixed Bug#47017 rpl_timezone fails on PB-2 with mismatch error
Fixed coredump in sql_plugin.cc:intern_plugin_lock() on mysqld start with PBXT
sql/mysqld.cc:
Fixed coredump in sql_plugin.cc:intern_plugin_lock() on mysqld start with PBXT
sql/share/errmsg.txt:
Row numbers are always positive
sql/sql_base.cc:
Fixed race condition in lock tables when killing insert_delayed thread.
This fixes Bug#47017 rpl_timezone fails on PB-2 with mismatch error
(Note that the patch only adds a continue; The rest is (required) indentation changes)
sql/sql_class.cc:
Fixed wrong output for high end machines in outfile_loaddata.
(Problem was that ER_TRUNCATED_WRONG_VALUE_FOR_FIELD expects ulong, not ulonglong)
sql/sql_insert.cc:
Ensure that if we get a lock problem with delayed_insert, the error is logged.
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 0e837d382b0..bf254534e4d 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -2046,7 +2046,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; |