bk commit into 5.0 tree (cmiller:1.2425)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller 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@stripped, 2007-03-30 09:27:43-04:00, cmiller@stripped +5 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/m1
  MERGE: 1.2410.1.11

  configure.in@stripped, 2007-03-30 09:27:39-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.416.1.18

  include/config-win.h@stripped, 2007-03-30 09:27:39-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.84.1.1

  sql/ha_ndbcluster.cc@stripped, 2007-03-30 09:27:39-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.301.1.1

  sql/mysqld.cc@stripped, 2007-03-30 09:27:39-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.598.1.3

  sql/sql_class.cc@stripped, 2007-03-30 09:27:39-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.256.1.11

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/m1/RESYNC

--- 1.425/configure.in	2007-03-23 09:53:06 -04:00
+++ 1.426/configure.in	2007-03-30 09:27:39 -04:00
@@ -2410,12 +2410,18 @@
     [with_man=yes]
 )
 
-if test "$with_man" = "yes"
+if test X"$with_man" = Xyes
 then
   man_dirs="man"
-  man1_files=`ls -1 $srcdir/man/*.1 | sed -e 's;^.*man/;;'`
+  if test X"$have_ndbcluster" = Xyes
+  then
+    man1_files=`ls $srcdir/man/*.1 | sed -e 's;^.*man/;;'`
+    man8_files=`ls $srcdir/man/*.8 | sed -e 's;^.*man/;;'`
+  else
+    man1_files=`ls $srcdir/man/*.1 | grep -v '/ndb' | sed -e 's;^.*man/;;'`
+    man8_files=`ls $srcdir/man/*.8 | grep -v '/ndb' | sed -e 's;^.*man/;;'`
+  fi
   man1_files=`echo $man1_files`
-  man8_files=`ls -1 $srcdir/man/*.8 | sed -e 's;^.*man/;;'`
   man8_files=`echo $man8_files`
 else
   man_dirs=""

--- 1.85/include/config-win.h	2007-03-23 09:37:51 -04:00
+++ 1.86/include/config-win.h	2007-03-30 09:27:39 -04:00
@@ -411,14 +411,8 @@
 #define shared_memory_buffer_length 16000
 #define default_shared_memory_base_name "MYSQL"
 
-#ifdef CYBOZU
-#define MYSQL_DEFAULT_CHARSET_NAME "utf8"
-#define MYSQL_DEFAULT_COLLATION_NAME "utf8_general_cs"
-#define HAVE_UTF8_GENERAL_CS 1
-#else
 #define MYSQL_DEFAULT_CHARSET_NAME "latin1"
 #define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci"
-#endif
 
 #define HAVE_SPATIAL 1
 #define HAVE_RTREE_KEYS 1
@@ -429,10 +423,8 @@
 /* Define charsets you want */
 /* #undef HAVE_CHARSET_armscii8 */
 /* #undef HAVE_CHARSET_ascii */
-#ifndef CYBOZU
 #define HAVE_CHARSET_big5 1
 #define HAVE_CHARSET_cp1250 1
-#endif
 /* #undef HAVE_CHARSET_cp1251 */
 /* #undef HAVE_CHARSET_cp1256 */
 /* #undef HAVE_CHARSET_cp1257 */
@@ -441,33 +433,27 @@
 /* #undef HAVE_CHARSET_cp866 */
 #define HAVE_CHARSET_cp932 1
 /* #undef HAVE_CHARSET_dec8 */
-#ifndef CYBOZU
 #define HAVE_CHARSET_eucjpms 1
 #define HAVE_CHARSET_euckr 1
 #define HAVE_CHARSET_gb2312 1
 #define HAVE_CHARSET_gbk 1
-#endif
 /* #undef HAVE_CHARSET_greek */
 /* #undef HAVE_CHARSET_hebrew */
 /* #undef HAVE_CHARSET_hp8 */
 /* #undef HAVE_CHARSET_keybcs2 */
 /* #undef HAVE_CHARSET_koi8r */
 /* #undef HAVE_CHARSET_koi8u */
-#ifndef CYBOZU
 #define HAVE_CHARSET_latin1 1
 #define HAVE_CHARSET_latin2 1
-#endif
 /* #undef HAVE_CHARSET_latin5 */
 /* #undef HAVE_CHARSET_latin7 */
 /* #undef HAVE_CHARSET_macce */
 /* #undef HAVE_CHARSET_macroman */
 #define HAVE_CHARSET_sjis 1
 /* #undef HAVE_CHARSET_swe7 */
-#ifndef CYBOZU
 #define HAVE_CHARSET_tis620 1
 #define HAVE_CHARSET_ucs2 1
 #define HAVE_CHARSET_ujis 1
-#endif
 #define HAVE_CHARSET_utf8 1
 #define HAVE_UCA_COLLATIONS 1
 

--- 1.599/sql/mysqld.cc	2007-03-23 09:53:06 -04:00
+++ 1.600/sql/mysqld.cc	2007-03-30 09:27:39 -04:00
@@ -2238,14 +2238,13 @@
 #ifdef SIGTSTP
   sigaddset(&set,SIGTSTP);
 #endif
-  sigaddset(&set,THR_SERVER_ALARM);
+  if (thd_lib_detected != THD_LIB_LT)
+    sigaddset(&set,THR_SERVER_ALARM);
   if (test_flags & TEST_SIGINT)
   {
     // May be SIGINT
     sigdelset(&set, thr_kill_signal);
   }
-  // For alarms
-  sigdelset(&set, thr_client_alarm);
   sigprocmask(SIG_SETMASK,&set,NULL);
   pthread_sigmask(SIG_SETMASK,&set,NULL);
   DBUG_VOID_RETURN;
@@ -3427,7 +3426,7 @@
 #else
   thr_kill_signal= SIGINT;
 #endif
-
+  
 #ifdef _CUSTOMSTARTUPCONFIG_
   if (_cust_check_startup())
   {

--- 1.304/sql/ha_ndbcluster.cc	2007-03-26 11:56:59 -04:00
+++ 1.305/sql/ha_ndbcluster.cc	2007-03-30 09:27:39 -04:00
@@ -5875,14 +5875,14 @@
 
   if (!is_autocommit)
   {
-    DBUG_PRINT("exit", ("Can't register table during transaction"))
+    DBUG_PRINT("exit", ("Can't register table during transaction"));
     DBUG_RETURN(FALSE);
   }
 
   if (ndb_get_commitcount(thd, m_dbname, m_tabname, &commit_count))
   {
     *engine_data= 0;
-    DBUG_PRINT("exit", ("Error, could not get commitcount"))
+    DBUG_PRINT("exit", ("Error, could not get commitcount"));
     DBUG_RETURN(FALSE);
   }
   *engine_data= commit_count;