summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-10-11 04:25:00 +0300
committerunknown <monty@hundin.mysql.fi>2001-10-11 04:25:00 +0300
commitb8eb83d42caf873c108dc68194f6e9eb0f7db47d (patch)
tree52236f7a3879ba894bd97a5318843692f1843b8d /tools
parent229e25f8cfc2601febe57e6e99ccdf9667f1add0 (diff)
downloadmariadb-git-b8eb83d42caf873c108dc68194f6e9eb0f7db47d.tar.gz
Portability fixes
Fixed bug with long log-filenames in Innobase. mysql-test/r/select.result: Turn off SCCS flag mysql-test/t/alias.test: Turn off SCCS flag mysql-test/t/backup.test: Turn off SCCS flag mysql-test/t/bdb-crash.test: Turn off SCCS flag mysql-test/t/bench_count_distinct.test: Turn off SCCS flag mysql-test/t/bulk_replace.test: Turn off SCCS flag mysql-test/t/check.test: Turn off SCCS flag mysql-test/t/count_distinct2-master.opt: Turn off SCCS flag mysql-test/t/count_distinct2.test: Turn off SCCS flag mysql-test/t/dirty-close.test: Turn off SCCS flag mysql-test/t/drop.test: Turn off SCCS flag mysql-test/t/flush.test: Turn off SCCS flag mysql-test/t/fulltext_cache.test: Turn off SCCS flag mysql-test/t/fulltext_distinct.test: Turn off SCCS flag mysql-test/t/fulltext_left_join.test: Turn off SCCS flag mysql-test/t/fulltext_update.test: Turn off SCCS flag mysql-test/t/fulltext_var.test: Turn off SCCS flag mysql-test/t/handler.test: Turn off SCCS flag mysql-test/t/having.test: Turn off SCCS flag mysql-test/t/innodb.test: Turn off SCCS flag mysql-test/t/join_crash.test: Turn off SCCS flag mysql-test/t/kill.test: Turn off SCCS flag mysql-test/t/lock.test: Turn off SCCS flag mysql-test/t/multi_update.test: Turn off SCCS flag mysql-test/t/myisam.test: Turn off SCCS flag mysql-test/t/openssl_1.test: Turn off SCCS flag mysql-test/t/openssl_2.test: Turn off SCCS flag mysql-test/t/order_fill_sortbuf-master.opt: Turn off SCCS flag mysql-test/t/order_fill_sortbuf.test: Turn off SCCS flag mysql-test/t/overflow.test: Turn off SCCS flag mysql-test/t/rpl000007-slave.opt: Turn off SCCS flag mysql-test/t/rpl000008-slave.opt: Turn off SCCS flag mysql-test/t/rpl000009-slave.opt: Turn off SCCS flag mysql-test/t/rpl000010-slave.opt: Turn off SCCS flag mysql-test/t/rpl000013-slave.opt: Turn off SCCS flag mysql-test/t/rpl000015-slave-master-info.opt: Turn off SCCS flag mysql-test/t/rpl000015-slave.sh: Turn off SCCS flag mysql-test/t/rpl000016-master.opt: Turn off SCCS flag mysql-test/t/rpl000016-slave-master-info.opt: Turn off SCCS flag mysql-test/t/rpl000016-slave.sh: Turn off SCCS flag mysql-test/t/rpl000017-slave.opt: Turn off SCCS flag mysql-test/t/rpl000017-slave.sh: Turn off SCCS flag mysql-test/t/rpl000017.test: Turn off SCCS flag mysql-test/t/rpl000018-master.opt: Turn off SCCS flag mysql-test/t/rpl000018-slave.opt: Turn off SCCS flag mysql-test/t/rpl000018.test: Turn off SCCS flag mysql-test/t/rpl_log.test: Turn off SCCS flag mysql-test/t/rpl_magic.test: Turn off SCCS flag mysql-test/t/rpl_mystery22.test: Turn off SCCS flag mysql-test/t/rpl_sporadic_master-master.opt: Turn off SCCS flag mysql-test/r/alias.result: Turn off SCCS flag mysql-test/r/backup.result: Turn off SCCS flag mysql-test/r/bdb-crash.result: Turn off SCCS flag mysql-test/r/bench_count_distinct.result: Turn off SCCS flag mysql-test/r/big_test.require: Turn off SCCS flag mysql-test/r/bulk_replace.result: Turn off SCCS flag mysql-test/r/check.result: Turn off SCCS flag mysql-test/r/count_distinct2.result: Turn off SCCS flag mysql-test/r/dirty-close.result: Turn off SCCS flag mysql-test/r/drop.result: Turn off SCCS flag mysql-test/r/flush.result: Turn off SCCS flag mysql-test/r/fulltext_cache.result: Turn off SCCS flag mysql-test/r/fulltext_distinct.result: Turn off SCCS flag mysql-test/r/fulltext_left_join.result: Turn off SCCS flag mysql-test/r/fulltext_multi.result: Turn off SCCS flag mysql-test/r/fulltext_order_by.result: Turn off SCCS flag mysql-test/r/fulltext_update.result: Turn off SCCS flag mysql-test/r/fulltext_var.result: Turn off SCCS flag mysql-test/r/func_timestamp.result: Turn off SCCS flag mysql-test/t/rpl_sporadic_master.test: Turn off SCCS flag mysql-test/t/select_found.test: Turn off SCCS flag mysql-test/t/status.test: Turn off SCCS flag mysql-test/t/symlink.test: Turn off SCCS flag mysql-test/t/type_decimal.test: Turn off SCCS flag mysql-test/t/union.test: Turn off SCCS flag mysql-test/t/user_var.test: Turn off SCCS flag mysql-test/r/handler.result: Turn off SCCS flag mysql-test/r/have_bdb.require: Turn off SCCS flag mysql-test/r/have_innodb.require: Turn off SCCS flag mysql-test/r/have_isam.require: Turn off SCCS flag mysql-test/r/have_openssl.require: Turn off SCCS flag mysql-test/r/have_openssl_1.require: Turn off SCCS flag mysql-test/r/have_openssl_2.require: Turn off SCCS flag mysql-test/r/have_raid.require: Turn off SCCS flag mysql-test/r/have_symlink.require: Turn off SCCS flag mysql-test/r/having.result: Turn off SCCS flag mysql-test/r/innodb.result: Turn off SCCS flag mysql-test/r/join_crash.result: Turn off SCCS flag mysql-test/r/kill.result: Turn off SCCS flag mysql-test/r/lock.result: Turn off SCCS flag mysql-test/r/multi_update.result: Turn off SCCS flag mysql-test/r/myisam.result: Turn off SCCS flag mysql-test/r/openssl_1.result: Turn off SCCS flag mysql-test/r/openssl_2.result: Turn off SCCS flag mysql-test/r/order_fill_sortbuf.result: Turn off SCCS flag mysql-test/r/rpl000001.result: Turn off SCCS flag mysql-test/r/rpl000004.result: Turn off SCCS flag mysql-test/r/rpl000017.result: Turn off SCCS flag mysql-test/r/rpl000018.result: Turn off SCCS flag mysql-test/r/rpl_log.result: Turn off SCCS flag mysql-test/r/rpl_magic.result: Turn off SCCS flag mysql-test/r/rpl_mystery22.result: Turn off SCCS flag mysql-test/r/rpl_sporadic_master.result: Turn off SCCS flag mysql-test/r/select_found.result: Turn off SCCS flag mysql-test/r/status.result: Turn off SCCS flag mysql-test/r/symlink.result: Turn off SCCS flag mysql-test/r/type_decimal.result: Turn off SCCS flag mysql-test/r/union.result: Turn off SCCS flag mysql-test/r/user_var.result: Turn off SCCS flag Docs/manual.texi: Fixed typo. innobase/log/log0log.c: Fixed too short filename buffer. mysys/mf_sort.c: Ensure that radix isn't used for VERY big arrrays. scripts/make_binary_distribution.sh: Add mysqlmanager-pwgen and mysqlmanagerc into binary distribution. sql-bench/test-insert.sh: Time out update_with_key_prefix sql/ha_innobase.cc: Use current directory as base dir, if we are not using the embedded version. tools/mysqlmanager.c: Portability fix
Diffstat (limited to 'tools')
-rw-r--r--tools/mysqlmanager.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/mysqlmanager.c b/tools/mysqlmanager.c
index 3a95b4e9a49..92f76ac4218 100644
--- a/tools/mysqlmanager.c
+++ b/tools/mysqlmanager.c
@@ -1543,10 +1543,11 @@ static struct manager_exec* manager_exec_new(char* arg_start,char* arg_end)
tmp->error="Too few arguments";
return tmp;
}
- tmp->data_buf=(char*)tmp+sizeof(*tmp);
+ /* We have to allocate 'args' first as this must be alligned */
+ tmp->args=(char**)(tmp +1);
+ tmp->data_buf= (char*) (tmp->args + num_args);
memcpy(tmp->data_buf,arg_start,arg_len);
tmp->data_buf_size=arg_len;
- tmp->args=(char**)(tmp->data_buf+arg_len);
tmp->num_args=num_args;
tmp->ident=tmp->data_buf;
tmp->ident_len=strlen(tmp->ident);