Commit 6f1db965 authored by unknown's avatar unknown
Browse files

merge

parents e90b64cd e3dc3db6
Loading
Loading
Loading
Loading
+8 −5
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ if test -r /proc/cpuinfo ; then
  fi

  # parse CPU flags
  for flag in `$cpuinfo | grep 'flags' | sed -e 's/^flags.*: //'`; do 
  for flag in `$cpuinfo | grep '^flags' | sed -e 's/^flags.*: //'`; do 
	eval cpu_flag_$flag=yes
  done
else
@@ -52,7 +52,6 @@ fi
# detect CPU shortname as used by gcc options 
# this list is not complete, feel free to add further entries
cpu_arg=""

case "$cpu_family--$model_name" in
  # DEC Alpha
  Alpha*EV6*)
@@ -99,8 +98,12 @@ case "$cpu_family--$model_name" in
    ;;

  #
  *ppc*)
    cpu_arg='powerpc'
    ;;
 
  *powerpc*)
    cpu_arg=`echo $model_name | sed -e"s/ppc//g"`
    cpu_arg='powerpc'
    ;;

  # unknown
+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@
Ndb_local_table_info *
Ndb_local_table_info::create(NdbTableImpl *table_impl, Uint32 sz)
{
  Uint32 tot_size= sizeof(NdbTableImpl *) + ((sz+7) & ~7); // round to Uint64
  Uint32 tot_size= sizeof(Ndb_local_table_info) - sizeof(Uint64)
    + ((sz+7) & ~7); // round to Uint64
  void *data= malloc(tot_size);
  if (data == 0)
    return 0;
+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ public:
  static Ndb_local_table_info *create(NdbTableImpl *table_impl, Uint32 sz=0);
  static void destroy(Ndb_local_table_info *);
  NdbTableImpl *m_table_impl;
  Uint64 m_local_data[1];
  Uint64 m_local_data[1]; // Must be last member. Used to access extra space.
private:
  Ndb_local_table_info(NdbTableImpl *table_impl);
  ~Ndb_local_table_info();