Skip to content

M
mariadb
Commit 33db6350 authored by unknown's avatar unknown
Browse files
Options

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
parents 206281e4 740fc88e
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
configure.in
View file @ 33db6350
...@@ -975,7 +975,7 @@ case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc in ...@@ -975,7 +975,7 @@ case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc in
CXXFLAGS="$CXXFLAGS -DBIG_TABLES" CXXFLAGS="$CXXFLAGS -DBIG_TABLES"
;; ;;
# workaround for Sun Forte compile problem for ndb # workaround for Sun Forte compile problem for ndb
*solaris2.10*-sparc-no) *solaris2.*-no)
ndb_cxxflags_fix="$ndb_cxxflags_fix -instances=static" ndb_cxxflags_fix="$ndb_cxxflags_fix -instances=static"
;; ;;
*) ;; *) ;;
......
ndb/include/kernel/signaldata/DictTabInfo.hpp
View file @ 33db6350
...@@ -51,7 +51,6 @@ class DictTabInfo { ...@@ -51,7 +51,6 @@ class DictTabInfo {
friend class Trix; friend class Trix;
friend class DbUtil; friend class DbUtil;
// API // API
friend class Table;
friend class NdbSchemaOp; friend class NdbSchemaOp;
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7