diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-10-13 09:28:35 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-10-13 09:28:35 -0600 |
| commit | 5c1dbfe6a7f42e368bfffb90974effbb8c6b9f6e (patch) | |
| tree | c4dd5da34820e3ec8484a4929bf1467d6492d92a /sql/slave.cc | |
| parent | a6c58676835f9424a5167a522497f1a20a5f03ee (diff) | |
| download | mariadb-git-5c1dbfe6a7f42e368bfffb90974effbb8c6b9f6e.tar.gz | |
64-bit portability fixes in network I/O
use $MAX_TABLES mysqltest variable to make join test portable
make test now works with the manager on IA64 Linux
client/mysqltest.c:
added MAX_TABLES variable
libmysql/libmysql.c:
portability fixes for 64-bit systems
mysql-test/mysql-test-run.sh:
fixed bug - wrong values of -display in xterm in gdb mode
mysql-test/r/join.result:
make test work on both 32-bit and 64-bit systems
mysql-test/t/join.test:
make test work on both 32-bit and 64-bit systems
sql/mini_client.cc:
64-bit portability fixes
sql/mini_client.h:
64-bit portability fixes
sql/slave.cc:
64-bit portability fixes
tools/mysqlmanager.c:
64-bit portability fixes
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 7c065a89c9d..376a8818d0a 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -335,7 +335,7 @@ static int init_intvar_from_file(int* var, IO_CACHE* f, int default_val) static int create_table_from_dump(THD* thd, NET* net, const char* db, const char* table_name) { - uint packet_len = my_net_read(net); // read create table statement + ulong packet_len = my_net_read(net); // read create table statement Vio* save_vio; HA_CHECK_OPT check_opt; TABLE_LIST tables; @@ -870,7 +870,7 @@ command"); static uint read_event(MYSQL* mysql, MASTER_INFO *mi) { - uint len = packet_error; + ulong len = packet_error; // for convinience lets think we start by // being in the interrupted state :-) int read_errno = EINTR; @@ -890,7 +890,7 @@ static uint read_event(MYSQL* mysql, MASTER_INFO *mi) } if (abort_loop || abort_slave) return packet_error; - if (len == packet_error || (int) len < 1) + if (len == packet_error || (long) len < 1) { sql_print_error("Error reading packet from server: %s (read_errno %d,\ server_errno=%d)", |