Commit e63fdaf2 authored by unknown's avatar unknown
Browse files

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

into hundin.mysql.fi:/home/jan/mysql-4.1
parents ef52e1c9 343e9bbd

mysql-test/mysql-test-run.sh

+3 −0
Original line number Diff line number Diff line
@@ -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

 if test -x "$BASEDIR/libexec/mysqld"

 then
@@ -558,6 +559,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/"
@@ -607,6 +609,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 TESTS_BINDIR 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 \

ndb/include/ndbapi/NdbRecAttr.hpp

+0 −36
Original line number Diff line number Diff line
@@ -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()

ndb/src/ndbapi/NdbRecAttr.cpp

+32 −0
Original line number Diff line number Diff line
@@ -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;

}