diff options
| author | unknown <kostja@bodhi.local> | 2006-07-14 02:07:37 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-07-14 02:07:37 +0400 |
| commit | 3657f34629eaa8ac37dc0dafad7a95dbe0b1180a (patch) | |
| tree | fdfdf2b6811d16be43f65fa0c95ba8b80a508c84 /mysql-test/mysql-test-run.sh | |
| parent | 3c3f9d9022800193c26caa599e85fc3685a4d1ff (diff) | |
| download | mariadb-git-3657f34629eaa8ac37dc0dafad7a95dbe0b1180a.tar.gz | |
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.
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 7 |
1 files changed, 1 insertions, 6 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 |