diff options
author | unknown <serg@serg.mylan> | 2005-06-03 18:29:36 +0200 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2005-06-03 18:29:36 +0200 |
commit | 70442e0ab77bb1c4a8378ec3f5789264ba565f71 (patch) | |
tree | 2bef8f19d3aae9ed13402a287789d648fcaad5b7 /sql/sql_repl.cc | |
parent | 755d2018ada199005b70b4836f6fbb56e2e7b892 (diff) | |
parent | ef30cc61ca92848336d20bf6ed317477e8a17960 (diff) | |
download | mariadb-git-70442e0ab77bb1c4a8378ec3f5789264ba565f71.tar.gz |
merged
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/create.result:
merged, need fixing
sql/sql_parse.cc:
merged (perhaps wrong)
Diffstat (limited to 'sql/sql_repl.cc')
-rw-r--r-- | sql/sql_repl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 4249c9e1809..fe95ee26748 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -81,7 +81,7 @@ static int send_file(THD *thd) char fname[FN_REFLEN+1]; const char *errmsg = 0; int old_timeout; - uint packet_len; + unsigned long packet_len; char buf[IO_SIZE]; // It's safe to alloc this DBUG_ENTER("send_file"); |