Commit 33db6350 authored by unknown's avatar unknown
Browse files

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
parents 206281e4 740fc88e

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -975,7 +975,7 @@ case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc in 
    CXXFLAGS="$CXXFLAGS -DBIG_TABLES"

    ;;

# workaround for Sun Forte compile problem for ndb

  *solaris2.10*-sparc-no)

  *solaris2.*-no)

    ndb_cxxflags_fix="$ndb_cxxflags_fix -instances=static"

    ;;

  *) ;;

ndb/include/kernel/signaldata/DictTabInfo.hpp

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ class DictTabInfo { 
  friend class Trix;

  friend class DbUtil;

  // API

  friend class Table;

  friend class NdbSchemaOp;

  

  /**