diff options
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 7 | ||||
| -rw-r--r-- | sql/ha_ndbcluster.cc | 6 | ||||
| -rw-r--r-- | sql/item.cc | 1 | ||||
| -rw-r--r-- | sql/item_xmlfunc.cc | 2 |
4 files changed, 4 insertions, 12 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 4cbb1bece9c..b74965b706e 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -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 diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 4aeddc3681f..64f0cc0b76e 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -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(void *arg __attribute__((unused))) ("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 { diff --git a/sql/item.cc b/sql/item.cc index 9c3cfab816b..eff2b744972 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1427,7 +1427,6 @@ bool agg_item_charsets(DTCollation &coll, const char *fname, 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; /* diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc index fb5ca083eab..ed4b81c897f 100644 --- a/sql/item_xmlfunc.cc +++ b/sql/item_xmlfunc.cc @@ -2396,7 +2396,7 @@ void Item_xml_str_func::fix_length_and_dec() 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) |