database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-29 00:08:14 +03:00
Code Activity

Post-merge fixes.

Browse Source 
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.
This commit is contained in:
unknown
2006-07-14 02:07:37 +04:00
parent 3c3f9d9022
commit 3657f34629
4 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/mysql-test-run.sh
View File

@@ -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