Commit 5f37520a authored by unknown's avatar unknown
Browse files

Merge mysql.com:/opt/local/work/mysql-4.1-root 

into  mysql.com:/opt/local/work/mysql-5.0-root


mysql-test/ndb/ndbcluster.sh:
  Auto merged
parents c87bfd13 52921923

mysql-test/ndb/ndbcluster.sh

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,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"

ndb/tools/ndb_size.pl

+1 −1
Original line number Diff line number Diff line
@@ -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]));