summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <tnurnberg@sin.intern.azundris.com>2007-06-27 09:48:37 +0200
committerunknown <tnurnberg@sin.intern.azundris.com>2007-06-27 09:48:37 +0200
commitd138b9a5532aa6556bbd41f421bc7fe4dea243d9 (patch)
tree32f6847b16a5e93a8628f3e6a270e8fbdae7ad2b
parent94d80f739cbf210d4af397fad667ad0270da9d1e (diff)
parent4fa62524a4661159eb8e154adc8922e37fe78dff (diff)
downloadmariadb-git-d138b9a5532aa6556bbd41f421bc7fe4dea243d9.tar.gz
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
-rw-r--r--sql/log.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc
index a5c5f42a393..f682b9b206e 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1886,7 +1886,7 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event)
split.
*/
- group= my_b_tell(&log_file);
+ group= (uint)my_b_tell(&log_file);
hdr_offs= carry= 0;
do