summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortnurnberg@sin.intern.azundris.com <>2007-06-27 09:48:37 +0200
committertnurnberg@sin.intern.azundris.com <>2007-06-27 09:48:37 +0200
commitcac7c4139873ddb8ba7a28af14707b031a0588dc (patch)
tree32f6847b16a5e93a8628f3e6a270e8fbdae7ad2b
parentb44ccd77bf04e9487cb49c916d0aefe86b1a823b (diff)
parent131db8123fc0054db7e46e0e5154623da2d9d537 (diff)
downloadmariadb-git-cac7c4139873ddb8ba7a28af14707b031a0588dc.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