summaryrefslogtreecommitdiff
path: root/sql/rpl_utility.cc
diff options
context:
space:
mode:
authorunknown <mkindahl@dl145h.mysql.com>2008-01-30 16:03:00 +0100
committerunknown <mkindahl@dl145h.mysql.com>2008-01-30 16:03:00 +0100
commit101c30ccc48d38c3ea98ebd89a350120a45aa591 (patch)
tree5718a5af3c09c59f20c1a2cca72da33e9c852e55 /sql/rpl_utility.cc
parent817bfa350c6ea2464f1357969f17acd08b909e14 (diff)
downloadmariadb-git-101c30ccc48d38c3ea98ebd89a350120a45aa591.tar.gz
Post-merge changes.
BitKeeper/deleted/.del-show_binlog_events2.inc: Delete: mysql-test/include/show_binlog_events2.inc client/mysqlbinlog.cc: char -> uchar for raw memory. sql/item_cmpfunc.cc: Adding cast to remove warning when converting negative integer to unsigned type. sql/log_event.cc: char -> uchar for raw memory. sql/log_event.h: char -> uchar for raw memory. sql/rpl_utility.cc: Adding cast to remove warning when converting negative integer to unsigned type. sql/slave.cc: char -> uchar for raw memory. sql/sql_repl.cc: char -> uchar for raw memory. sql-common/client.c: char -> uchar for raw memory.
Diffstat (limited to 'sql/rpl_utility.cc')
-rw-r--r--sql/rpl_utility.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc
index b3ca26d4c2c..b548550ef54 100644
--- a/sql/rpl_utility.cc
+++ b/sql/rpl_utility.cc
@@ -164,7 +164,7 @@ uint32 table_def::calc_field_size(uint col, uchar *master_data) const
break;
}
default:
- length= -1;
+ length= ~(uint32) -1;
}
return length;
}