mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse source 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl


mysql-test/mysql-test-run.sh:
  Auto merged
This commit is contained in:
unknown 2005-01-24 16:57:57 +01:00
commit cc18b5f72a
4 changed files with 56 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mysql-test/mysql-test-run.sh
View file

@ -537,6 +537,7 @@ if [ x$SOURCE_DIST = x1 ] ; then
INSTALL_DB="./install_test_db"
MYSQL_FIX_SYSTEM_TABLES="$BASEDIR/scripts/mysql_fix_privilege_tables"
NDB_TOOLS_DIR="$BASEDIR/ndb/tools"
NDB_MGM="$BASEDIR/ndb/src/mgmclient/ndb_mgm"
else
# We have a binary installation. Note that this can be both from
@ -564,6 +565,7 @@ else
INSTALL_DB="./install_test_db --bin"
MYSQL_FIX_SYSTEM_TABLES="$CLIENT_BINDIR/mysql_fix_privilege_tables"
NDB_TOOLS_DIR="$CLIENT_BINDIR"
NDB_MGM="$CLIENT_BINDIR/ndb_mgm"
if test -d "$BASEDIR/share/mysql/english"
then
LANGUAGE="$BASEDIR/share/mysql/english/"
@ -629,6 +631,7 @@ MYSQL="$MYSQL --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --u
export MYSQL MYSQL_DUMP MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES
export CLIENT_BINDIR MYSQL_CLIENT_TEST CHARSETSDIR
export NDB_TOOLS_DIR
export NDB_MGM
MYSQL_TEST_ARGS="--no-defaults --socket=$MASTER_MYSOCK --database=$DB \
--user=$DBUSER --password=$DBPASSWD --silent -v --skip-safemalloc \

36
ndb/include/ndbapi/NdbRecAttr.hpp
View file

@ -300,15 +300,6 @@ NdbRecAttr::arraySize() const
return theArraySize;
}
inline
Int64
NdbRecAttr::int64_value() const
{
Int64 val;
memcpy(&val,theRef,8);
return val;
}
inline
Int32
NdbRecAttr::int32_value() const
@ -330,15 +321,6 @@ NdbRecAttr::char_value() const
return *(char*)theRef;
}
inline
Uint64
NdbRecAttr::u_64_value() const
{
Uint64 val;
memcpy(&val,theRef,8);
return val;
}
inline
Uint32
NdbRecAttr::u_32_value() const
@ -360,24 +342,6 @@ NdbRecAttr::u_char_value() const
return *(Uint8*)theRef;
}
inline
float
NdbRecAttr::float_value() const
{
float val;
memcpy(&val,theRef,sizeof(val));
return val;
}
inline
double
NdbRecAttr::double_value() const
{
double val;
memcpy(&val,theRef,sizeof(val));
return val;
}
inline
void
NdbRecAttr::release()

32
ndb/src/ndbapi/NdbRecAttr.cpp
View file

@ -245,3 +245,35 @@ NdbOut& operator<<(NdbOut& out, const NdbRecAttr &r)
return out;
}
Int64
NdbRecAttr::int64_value() const
{
Int64 val;
memcpy(&val,theRef,8);
return val;
}
Uint64
NdbRecAttr::u_64_value() const
{
Uint64 val;
memcpy(&val,theRef,8);
return val;
}
float
NdbRecAttr::float_value() const
{
float val;
memcpy(&val,theRef,sizeof(val));
return val;
}
double
NdbRecAttr::double_value() const
{
double val;
memcpy(&val,theRef,sizeof(val));
return val;
}

27
ndb/tools/waiter.cpp
View file

@ -31,11 +31,13 @@ waitClusterStatus(const char* _addr, ndb_mgm_node_status _status,
unsigned int _timeout);
enum ndb_waiter_options {
NDB_STD_OPTS_OPTIONS
NDB_STD_OPTS_OPTIONS,
OPT_WAIT_STATUS_NOT_STARTED
};
NDB_STD_OPTS_VARS;
static int _no_contact = 0;
static int _not_started = 0;
static int _timeout = 120;
static struct my_option my_long_options[] =
{
@ -43,6 +45,9 @@ static struct my_option my_long_options[] =
{ "no-contact", 'n', "Wait for cluster no contact",
(gptr*) &_no_contact, (gptr*) &_no_contact, 0,
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
{ "not-started", OPT_WAIT_STATUS_NOT_STARTED, "Wait for cluster not started",
(gptr*) &_not_started, (gptr*) &_not_started, 0,
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
{ "timeout", 't', "Timeout to wait",
(gptr*) &_timeout, (gptr*) &_timeout, 0,
GET_INT, REQUIRED_ARG, 120, 0, 0, 0, 0, 0 },
@ -91,12 +96,22 @@ int main(int argc, char** argv){
if (_hostName == 0)
_hostName= opt_connect_str;
if (_no_contact) {
if (waitClusterStatus(_hostName, NDB_MGM_NODE_STATUS_NO_CONTACT, _timeout) != 0)
return NDBT_ProgramExit(NDBT_FAILED);
} else if (waitClusterStatus(_hostName, NDB_MGM_NODE_STATUS_STARTED, _timeout) != 0)
return NDBT_ProgramExit(NDBT_FAILED);
enum ndb_mgm_node_status wait_status;
if (_no_contact)
{
wait_status= NDB_MGM_NODE_STATUS_NO_CONTACT;
}
else if (_not_started)
{
wait_status= NDB_MGM_NODE_STATUS_NOT_STARTED;
}
else
{
wait_status= NDB_MGM_NODE_STATUS_STARTED;
}
if (waitClusterStatus(_hostName, wait_status, _timeout) != 0)
return NDBT_ProgramExit(NDBT_FAILED);
return NDBT_ProgramExit(NDBT_OK);
}