Merge hh-nb.hungers:/work/merge/mysql-5.1-build

into  hh-nb.hungers:/work/merge/mysql-5.1-bug34190

configure.in

@@ -188,7 +188,7 @@ CC_VERSION=`$CC --version | sed 1q`
 esac
 if test $? -eq "0"
 then
-  AC_MSG_CHECKING("C Compiler version");
+  AC_MSG_CHECKING("C Compiler version")
   AC_MSG_RESULT("$CC $CC_VERSION")
 else
 CC_VERSION=""
@@ -1296,7 +1296,7 @@ See the Installation chapter in the Reference Manual for more information.])
             AC_MSG_RESULT("no need to check headers")
         fi
         
-        AC_MSG_CHECKING("for pthread_create in -lpthread");
+        AC_MSG_CHECKING("for pthread_create in -lpthread")
         ac_save_LIBS="$LIBS"
         LIBS="$LIBS -lpthread"
         AC_TRY_LINK( [#include <pthread.h>],
@@ -1356,7 +1356,7 @@ then
       then
 	AC_MSG_RESULT("yes")
       else
-	AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.]);
+	AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.])
       fi
       AC_MSG_RESULT("yes")
     elif test -f /usr/local/lib/libpthread.a -o -f /usr/local/lib/libpthread.so
@@ -1372,7 +1372,7 @@ then
       then
 	AC_MSG_RESULT("yes")
       else
-	AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.]);
+	AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.])
       fi
       AC_MSG_RESULT("yes")
     # Hack for SCO UnixWare 7.1.x
@@ -1517,7 +1517,7 @@ else
   AC_MSG_RESULT("$with_posix_threads")
   if test "$with_posix_threads" = "no"
   then
-    AC_MSG_CHECKING("for pthread_create in -lpthread");
+    AC_MSG_CHECKING("for pthread_create in -lpthread")
     ac_save_LIBS="$LIBS"
     LIBS="$LIBS -lpthread"
     CLIENT_THREAD_LIBS="-lpthread"
@@ -1530,7 +1530,7 @@ else
     then
       LIBS=" $ac_save_LIBS -lpthreads"
       CLIENT_THREAD_LIBS="-lpthreads"
-      AC_MSG_CHECKING("for pthread_create in -lpthreads");
+      AC_MSG_CHECKING("for pthread_create in -lpthreads")
       AC_TRY_LINK(
       [#include <pthread.h>],
       [ pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
@@ -1541,7 +1541,7 @@ else
         # This is for FreeBSD
         LIBS="$ac_save_LIBS -pthread"
         CLIENT_THREAD_LIBS="-pthread"
-        AC_MSG_CHECKING("for pthread_create in -pthread");
+        AC_MSG_CHECKING("for pthread_create in -pthread")
         AC_TRY_LINK(
         [#include <pthread.h>],
         [ pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
@@ -1915,7 +1915,7 @@ if test "$ac_cv_conv_longlong_to_float" != "yes"
 then
   AC_MSG_ERROR([Your compiler cannot convert a longlong value to a float!
 If you are using gcc 2.8.# you should upgrade to egcs 1.0.3 or newer and try
-again]);
+again])
 fi
 fi
 AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])
@@ -2079,7 +2079,7 @@ CFLAGS="$ORG_CFLAGS"
 AC_CHECK_FUNC(fseeko,
 [if test "$large_file_support" = no -a "$TARGET_LINUX" = "true";
 then
-  AC_MSG_ERROR("Found fseeko symbol but large_file_support is not enabled!");
+  AC_MSG_ERROR("Found fseeko symbol but large_file_support is not enabled!")
 fi]
 )
 

scripts/CMakeLists.txt

@@ -61,18 +61,12 @@ CONFIGURE_FILE(mysql_config.pl.in
 CONFIGURE_FILE(mysql_convert_table_format.sh
                scripts/mysql_convert_table_format.pl ESCAPE_QUOTES @ONLY)
 
-CONFIGURE_FILE(mysql_explain_log.sh
-               scripts/mysql_explain_log.pl ESCAPE_QUOTES @ONLY)
-
 CONFIGURE_FILE(mysql_install_db.pl.in
                scripts/mysql_install_db.pl ESCAPE_QUOTES @ONLY)
 
 CONFIGURE_FILE(mysql_secure_installation.pl.in
                scripts/mysql_secure_installation.pl ESCAPE_QUOTES @ONLY)
 
-CONFIGURE_FILE(mysql_tableinfo.sh
-               scripts/mysql_tableinfo.pl ESCAPE_QUOTES @ONLY)
-
 CONFIGURE_FILE(mysqld_multi.sh
                scripts/mysqld_multi.pl ESCAPE_QUOTES @ONLY)
 

scripts/Makefile.am

@@ -90,7 +90,6 @@ CLEANFILES =		@server_scripts@ \
 			mysql_find_rows \
 			mysqlhotcopy \
 			mysqldumpslow \
-			mysql_tableinfo \
 			mysqld_multi
 
 # Default same as 'pkgdatadir', but we can override it

scripts/make_win_bin_dist

@@ -322,10 +322,8 @@ fi
 mysql_scripts="\
 mysql_config.pl \
 mysql_convert_table_format.pl \
-mysql_explain_log.pl \
 mysql_install_db.pl \
 mysql_secure_installation.pl \
-mysql_tableinfo.pl \
 mysqld_multi.pl \
 mysqldumpslow.pl \
 mysqlhotcopy.pl \

sql/ha_ndbcluster_binlog.cc

@@ -1002,7 +1002,7 @@ static void ndbcluster_get_schema(NDB_SHARE *share,
     uint blob_len= field_blob->get_length((*field)->ptr);
     uchar *blob_ptr= 0;
     field_blob->get_ptr(&blob_ptr);
-    assert(blob_len == 0 || blob_ptr != 0);
+    DBUG_ASSERT(blob_len == 0 || blob_ptr != 0);
     s->query_length= blob_len;
     s->query= sql_strmake((char*) blob_ptr, blob_len);
   }