bk commit into 5.0 tree (msvensson:1.1896)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1896 05/04/27 12:30:11 msvensson@neptunus.(none) +4 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug9714
  into neptunus.(none):/home/msvensson/mysql/mysql-5.0

  sql/item.cc
    1.112 05/04/27 12:30:09 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/ha_ndbcluster.cc
    1.179 05/04/27 12:30:09 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.197 05/04/27 12:30:09 msvensson@neptunus.(none) +0 -0
    Auto merged

  configure.in
    1.293 05/04/27 12:30:08 msvensson@neptunus.(none) +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0/RESYNC

--- 1.292/configure.in	2005-04-26 19:29:57 +02:00
+++ 1.293/configure.in	2005-04-27 12:30:08 +02:00
@@ -336,7 +336,7 @@
 AC_SUBST(INSTALL_SCRIPT)
 
 export CC CXX CFLAGS LD LDFLAGS AR
-
+echo "GXX: $GXX"
 if test "$GXX" = "yes"
 then
   # mysqld requires -fno-implicit-templates.
@@ -344,36 +344,16 @@
   # mysqld doesn't use run-time-type-checking, so we disable it.
   CXXFLAGS="$CXXFLAGS -fno-implicit-templates -fno-exceptions -fno-rtti"
 
-  # If you are using 'gcc' 3.0 (not g++) to compile C++ programs on Linux,
-  # we will gets some problems when linking static programs.
-  # The following code is used to fix this problem.
-
+  #CXX_VERNO=`echo $CXX_VERSION | sed -e 's/[[^0-9. ]]//g; s/^ *//g; s/ .*//g'`
+  echo "CXX: $CXX"
   if echo $CXX | grep gcc > /dev/null 2>&1
   then
-    GCC_VERSION=`gcc -v 2>&1 | grep version | sed -e 's/[[^0-9. ]]//g; s/^ *//g;
s/ .*//g'`
-    case $SYSTEM_TYPE in
-      *freebsd*)
-        # The libsupc++ library on freebsd with gcc 3.4.2 is dependent on 
-        # libstdc++, disable it  since other solution works fine
-        GCC_VERSION="NOSUPCPP_$GCC_VERSION"
-      ;;
-      *) 
-      ;;
-    esac
-    echo "Using gcc version '$GCC_VERSION'"
-    case "$GCC_VERSION" in
-      3.4.*|3.5.*)
-        # Statically link the language support function's found in libsupc++.a
-        LIBS="$LIBS -lsupc++"
-	echo "Using -libsupc++ for static linking with gcc"
-      ;;
-      *)
-        # Using -lsupc++ doesn't work in gcc 3.3 on SuSE 9.2
-        # (causes link failures when linking things staticly)
-        CXXFLAGS="$CXXFLAGS -DUSE_MYSYS_NEW -DDEFINE_CXA_PURE_VIRTUAL"
-	echo "Using MYSYS_NEW for static linking with gcc"
-      ;;
-    esac
+    echo "Setting CXXFLAGS"
+    # If you are using 'gcc' 3.0 (not g++) to compile C++ programs on Linux,
+    # we will gets some problems when linking static programs.
+    # The following code is used to fix this problem.
+    CXXFLAGS="$CXXFLAGS -DUSE_MYSYS_NEW -DDEFINE_CXA_PURE_VIRTUAL"
+    echo "Using MYSYS_NEW for static linking with gcc"
   fi
 fi
 

--- 1.111/sql/item.cc	2005-04-21 16:35:57 +02:00
+++ 1.112/sql/item.cc	2005-04-27 12:30:09 +02:00
@@ -43,11 +43,11 @@
   item->max_length= item->float_length(arg->decimals);
 }
 
+static const Hybrid_type_traits real_traits_instance;
 
 const Hybrid_type_traits *Hybrid_type_traits::instance()
 {
-  static const Hybrid_type_traits real_traits;
-  return &real_traits;
+  return &real_traits_instance;
 }
 
 
@@ -67,11 +67,11 @@
 }
 
 /* Hybrid_type_traits_decimal */
+static const Hybrid_type_traits_decimal decimal_traits_instance;
 
 const Hybrid_type_traits_decimal *Hybrid_type_traits_decimal::instance()
 {
-  static const Hybrid_type_traits_decimal decimal_traits;
-  return &decimal_traits;
+  return &decimal_traits_instance;
 }
 
 
@@ -143,11 +143,11 @@
 }
 
 /* Hybrid_type_traits_integer */
+static const Hybrid_type_traits_integer integer_traits_instance;
 
 const Hybrid_type_traits_integer *Hybrid_type_traits_integer::instance()
 {
-  static const Hybrid_type_traits_integer integer_traits;
-  return &integer_traits;
+  return &integer_traits_instance;
 }
 
 void

--- 1.178/sql/ha_ndbcluster.cc	2005-04-25 11:55:25 +02:00
+++ 1.179/sql/ha_ndbcluster.cc	2005-04-27 12:30:09 +02:00
@@ -3074,10 +3074,15 @@
   DBUG_RETURN(extra(operation));
 }
 
+static const char *ha_ndbcluster_exts[] = {
+ ha_ndb_ext,
+ NullS
+};
 
 const char** ha_ndbcluster::bas_ext() const
-{ static const char *ext[]= { ha_ndb_ext, NullS }; return ext; }
-
+{
+  return ha_ndbcluster_exts;
+}
 
 /*
   How many seeks it will take to read through the table

--- 1.196/sql/ha_innodb.cc	2005-04-26 16:45:26 +02:00
+++ 1.197/sql/ha_innodb.cc	2005-04-27 12:30:09 +02:00
@@ -2138,16 +2138,19 @@
 
 /********************************************************************
 Gives the file extension of an InnoDB single-table tablespace. */
+static const char* ha_innobase_exts[] = {
+  ".ibd",
+  NullS
+};
 
 const char**
 ha_innobase::bas_ext() const
 /*========================*/
 				/* out: file extension string */
 {
-	static const char* ext[] = {".ibd", NullS};
-
-	return(ext);
+  return ha_innobase_exts;
 }
+
 
 /*********************************************************************
 Normalizes a table name string. A normalized name consists of the