diff options
| author | unknown <stewart@mysql.com> | 2006-01-19 22:52:22 +1100 |
|---|---|---|
| committer | unknown <stewart@mysql.com> | 2006-01-19 22:52:22 +1100 |
| commit | 52921923abc1dfc0c5d98fc4673f45e93d00c1c7 (patch) | |
| tree | 6b5b26521eb2fb3de944e84dd84f37b6bbdb980e | |
| parent | 1e8e302effdb998223c65ebfe8dbea2d01a8385c (diff) | |
| parent | 71f54b97cbb6dc31c31046ef07831af15cc2ed2e (diff) | |
| download | mariadb-git-52921923abc1dfc0c5d98fc4673f45e93d00c1c7.tar.gz | |
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/stewart/Documents/MySQL/4.1/main
| -rw-r--r-- | mysql-test/ndb/ndbcluster.sh | 2 | ||||
| -rw-r--r-- | ndb/tools/ndb_size.pl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/ndb/ndbcluster.sh b/mysql-test/ndb/ndbcluster.sh index 16bb3a9b122..d3471b6cfde 100644 --- a/mysql-test/ndb/ndbcluster.sh +++ b/mysql-test/ndb/ndbcluster.sh @@ -135,7 +135,7 @@ if [ ! -x "$exec_waiter" ]; then fi exec_mgmtclient="$exec_mgmtclient --no-defaults $NDB_MGM_EXTRA_OPTS" -exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults $NDB_MGMD_EXTRA_OPTS" +exec_mgmtsrvr="$exec_mgmtsrvr $NDB_MGMD_EXTRA_OPTS" exec_ndb="$exec_ndb --no-defaults $NDBD_EXTRA_OPTS" exec_waiter="$exec_waiter --no-defaults" diff --git a/ndb/tools/ndb_size.pl b/ndb/tools/ndb_size.pl index e0085c619f0..c285a7590fd 100644 --- a/ndb/tools/ndb_size.pl +++ b/ndb/tools/ndb_size.pl @@ -147,7 +147,7 @@ foreach(@{$tables}) { my $fixed= 1+$size; my @dynamic=$dbh->selectrow_array("select avg(length(`" - .$name. + .$name ."`)) from `".$table.'`'); $dynamic[0]=0 if !$dynamic[0]; @realsize= ($fixed,$fixed,ceil($dynamic[0])); |