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 /client | |
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 'client')
-rw-r--r-- | client/mysqltest.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 1bf3ab75aed..d1d25a499ce 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -2158,12 +2158,15 @@ static void var_from_env(const char* name, const char* def_val) static void init_var_hash() { + VAR* v; if (hash_init(&var_hash, 1024, 0, 0, get_var_key, var_free, MYF(0))) die("Variable hash initialization failed"); var_from_env("MASTER_MYPORT", "9306"); var_from_env("SLAVE_MYPORT", "9307"); var_from_env("MYSQL_TEST_DIR", "/tmp"); var_from_env("BIG_TEST", opt_big_test ? "1" : "0"); + v=var_init(0,"MAX_TABLES", 0, (sizeof(ulong) == 4) ? "31" : "63",0); + hash_insert(&var_hash, (byte*)v); } |