diff options
| author | unknown <brian@brian-akers-computer.local> | 2005-06-08 22:29:10 -0700 |
|---|---|---|
| committer | unknown <brian@brian-akers-computer.local> | 2005-06-08 22:29:10 -0700 |
| commit | e809d1e18979a7c95306ae50d46c1b7bf25234fa (patch) | |
| tree | 1ddc4488db0a2afd8b2aa5021426a9e4159b908e /sql/log_event.cc | |
| parent | 2e43fc337bec293d46ba1dd824d5edeead646d5f (diff) | |
| parent | f4958dc0db510ddb2b44e2dee0b7ddbd9ab5d396 (diff) | |
| download | mariadb-git-e809d1e18979a7c95306ae50d46c1b7bf25234fa.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
sql/log_event.cc:
Auto merged
sql/sql_acl.cc:
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 db631f756bd..8f109f00c5f 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -707,7 +707,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) |