bk commit into 5.1 tree (kostja:1.2249)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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, 2006-07-14 02:07:37+04:00, kostja@stripped +4 -0
  Post-merge fixes.

  mysql-test/mysql-test-run.sh@stripped, 2006-07-14 02:07:31+04:00, kostja@stripped +1 -6
    A post-merge fix (apply a change lost during the merge).

  sql/ha_ndbcluster.cc@stripped, 2006-07-14 02:07:32+04:00, kostja@stripped +2 -4
    A post-merge fix: resolve a merge error.

  sql/item.cc@stripped, 2006-07-14 02:07:32+04:00, kostja@stripped +0 -1
    Fix a merge error.

  sql/item_xmlfunc.cc@stripped, 2006-07-14 02:07:32+04:00, kostja@stripped +1 -1
    Use the new signature of agg_arg_charsets.

# 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:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.1-runtime-merge-5.0

--- 1.328/mysql-test/mysql-test-run.sh	2006-07-14 02:07:46 +04:00
+++ 1.329/mysql-test/mysql-test-run.sh	2006-07-14 02:07:46 +04:00
@@ -2178,12 +2178,7 @@ then
     USE_NDBCLUSTER_OPT=
   fi
 
-# Do not automagically start daemons if we are in gdb or running only one
-# test case
-  if [ -z "$DO_GDB" ] && [ -z "$DO_DDD" ]
-  then
-    mysql_start
-  fi
+  mysql_start
   $ECHO  "Loading Standard Test Databases"
   mysql_loadstd
 fi

--- 1.198/sql/item.cc	2006-07-14 02:07:46 +04:00
+++ 1.199/sql/item.cc	2006-07-14 02:07:46 +04:00
@@ -1427,7 +1427,6 @@ bool agg_item_charsets(DTCollation &coll
   LINT_INIT(safe_args[1]);
 
   if (agg_item_collations(coll, fname, args, nargs, flags, item_sep))
-  if (agg_item_collations(coll, fname, args, nargs, flags))
     return TRUE;
 
   /*

--- 1.17/sql/item_xmlfunc.cc	2006-07-14 02:07:46 +04:00
+++ 1.18/sql/item_xmlfunc.cc	2006-07-14 02:07:46 +04:00
@@ -2396,7 +2396,7 @@ void Item_xml_str_func::fix_length_and_d
 
   nodeset_func= 0;
 
-  if (agg_arg_charsets(collation, args, arg_count, MY_COLL_CMP_CONV))
+  if (agg_arg_charsets(collation, args, arg_count, MY_COLL_CMP_CONV, 1))
     return;
 
   if (collation.collation->mbminlen > 1)

--- 1.342/sql/ha_ndbcluster.cc	2006-07-14 02:07:46 +04:00
+++ 1.343/sql/ha_ndbcluster.cc	2006-07-14 02:07:47 +04:00
@@ -7417,15 +7417,13 @@ int
 ndb_get_table_statistics(Ndb* ndb, const NDBTAB *ndbtab,
                          struct Ndb_statistics * ndbstat)
 {
-  DBUG_ENTER("ndb_get_table_statistics");
-  DBUG_PRINT("enter", ("table: %s", ndbtab->getName()));
   NdbTransaction* pTrans;
   NdbError error;
   int retries= 10;
   int retry_sleep= 30 * 1000; /* 30 milliseconds */
   char buff[22], buff2[22], buff3[22], buff4[22];
   DBUG_ENTER("ndb_get_table_statistics");
-  DBUG_PRINT("enter", ("table: %s", table));
+  DBUG_PRINT("enter", ("table: %s", ndbtab->getName()));
 
   DBUG_ASSERT(ndbtab != 0);
 
@@ -8170,7 +8168,7 @@ pthread_handler_t ndb_util_thread_func(v
                      ("Table: %s, commit_count: %llu, rows: %llu",
                       share->key,
                       llstr(stat.commit_count, buff),
-                      llstr(stat.row_count, buff)));
+                      llstr(stat.row_count, buff2)));
         }
         else
         {