From 3657f34629eaa8ac37dc0dafad7a95dbe0b1180a Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 14 Jul 2006 02:07:37 +0400 Subject: Post-merge fixes. mysql-test/mysql-test-run.sh: A post-merge fix (apply a change lost during the merge). sql/ha_ndbcluster.cc: A post-merge fix: resolve a merge error. sql/item.cc: Fix a merge error. sql/item_xmlfunc.cc: Use the new signature of agg_arg_charsets. --- mysql-test/mysql-test-run.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'mysql-test/mysql-test-run.sh') 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 -- cgit v1.2.1