diff options
| author | unknown <ndbdev@dl145b.mysql.com> | 2005-06-10 07:22:27 +0200 |
|---|---|---|
| committer | unknown <ndbdev@dl145b.mysql.com> | 2005-06-10 07:22:27 +0200 |
| commit | 2afc0b1e40eeb5e5426b5e9a04e8f62b99b64d3d (patch) | |
| tree | 7e3cb94eb84a8311f4fe19dd1bc92a032b8ea4da /sql/log_event.cc | |
| parent | 0af7dd0c9a06e57cd53aab936e64ddba48b939b8 (diff) | |
| parent | 751089491c337c436e398e31e79410f7929f8dd3 (diff) | |
| download | mariadb-git-2afc0b1e40eeb5e5426b5e9a04e8f62b99b64d3d.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
Auto merged
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 3b6b3cda0b4..08aedfb3f63 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -708,7 +708,7 @@ failed my_b_read")); Log_event *res= 0; #ifndef max_allowed_packet THD *thd=current_thd; - uint max_allowed_packet= thd ? thd->variables.max_allowed_packet : ~0; + uint max_allowed_packet= thd ? thd->variables.max_allowed_packet : ~(ulong)0; #endif if (data_len > max_allowed_packet) |