merge with 5.3

sql/sql_insert.cc:
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
  ******
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
  small cleanup
  ******
  small cleanup

1 files changed, 1 insertions, 17 deletions

diff --git a/BUILD/compile-dist b/BUILD/compile-dist
index 5583f2b81c9..754874b1b2b 100755
--- a/BUILD/compile-dist
+++ b/BUILD/compile-dist
@@ -1,20 +1,4 @@
 #!/bin/sh
-
-# Copyright (C) 2004, 2006 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
 #
 # This script's purpose is to update the automake/autoconf helper scripts and
 # to run a plain "configure" without any special compile flags. Only features
@@ -44,7 +28,7 @@ fi
 # Default to gcc for CC and CXX
 if test -z "$CXX" ; then
   export CXX
-  CXX=gcc
+  CXX=g++
   # Set some required compile options
   if test -z "$CXXFLAGS" ; then
     export CXXFLAGS