1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged
This commit is contained in:
unknown 2005-04-01 11:15:11 +02:00
commit 20add8c2e8
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.in
View File

@ -353,7 +353,8 @@ then
then then
if $CXX -v 2>&1 | grep 'version 3' > /dev/null 2>&1 if $CXX -v 2>&1 | grep 'version 3' > /dev/null 2>&1
then then
CXXFLAGS="$CXXFLAGS -DUSE_MYSYS_NEW -DDEFINE_CXA_PURE_VIRTUAL" # Statically link the language support function's found in libsupc++.a
LIBS="$LIBS -lsupc++"
fi fi
fi fi
fi fi

3
sql/ha_berkeley.cc
View File

@ -372,9 +372,8 @@ void berkeley_cleanup_log_files(void)
** Berkeley DB tables ** Berkeley DB tables
*****************************************************************************/ *****************************************************************************/
static const char *ha_bdb_bas_exts[]= { ha_berkeley_ext, NullS };
const char **ha_berkeley::bas_ext() const const char **ha_berkeley::bas_ext() const
{ return ha_bdb_bas_exts; } { static const char *ext[]= { ha_berkeley_ext, NullS }; return ext; }
ulong ha_berkeley::index_flags(uint idx, uint part, bool all_parts) const ulong ha_berkeley::index_flags(uint idx, uint part, bool all_parts) const

8
sql/ha_ndbcluster.cc
View File

@ -3022,12 +3022,8 @@ int ha_ndbcluster::extra_opt(enum ha_extra_function operation, ulong cache_size)
} }
static const char *ha_ndb_bas_ext[]= { ha_ndb_ext, NullS }; const char** ha_ndbcluster::bas_ext() const
const char** { static const char *ext[]= { ha_ndb_ext, NullS }; return ext; }
ha_ndbcluster::bas_ext() const
{
return ha_ndb_bas_ext;
}
/* /*