summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorndbdev@dl145b.mysql.com <>2005-06-03 11:16:37 +0200
committerndbdev@dl145b.mysql.com <>2005-06-03 11:16:37 +0200
commit25cb14234a71bad4527807a22959c7a66dd83680 (patch)
tree18503e6732685a35b5e3a9c748db7aac1455c863
parent7bd3dd7cb319e901290846544c6a518dfcef0baa (diff)
downloadmariadb-git-25cb14234a71bad4527807a22959c7a66dd83680.tar.gz
sql_repl.cc:
Bug #11064 some read error not detected in replication on 64-bit platform
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--sql/sql_repl.cc2
2 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 499e3cdd4f5..185f84cc772 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -110,6 +110,7 @@ mwagner@here.mwagner.org
mwagner@ultrafly.mysql.com
mwagner@work.mysql.com
mysqldev@build.mysql2.com
+ndbdev@dl145b.mysql.com
nick@mysql.com
nick@nick.leippe.com
patg@krsna.patg.net
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
index 9485031c144..ed2d477fc5d 100644
--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -84,7 +84,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");