diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2006-12-31 12:39:20 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2006-12-31 12:39:20 +0400 |
| commit | 84d0cda44c8fd13b3b88f7b90ec8fb755caef361 (patch) | |
| tree | bd5218816ba9b52d92e7f30d5d6e4c12b6153b87 /libmysqld/examples | |
| parent | 27ecbeecdc0a064d0ff5ea88abe01e786fcc5b99 (diff) | |
| parent | 44e0239396a0337fcdb455589f591dd42f2acd43 (diff) | |
| download | mariadb-git-84d0cda44c8fd13b3b88f7b90ec8fb755caef361.tar.gz | |
Merge mysql.com:/d2/hf/clean/my50-clean
into mysql.com:/d2/hf/common/my50-common
mysql-test/mysql-test-run.pl:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
Diffstat (limited to 'libmysqld/examples')
| -rwxr-xr-x | libmysqld/examples/test-run | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/examples/test-run b/libmysqld/examples/test-run index c7434488259..aea5b13eaba 100755 --- a/libmysqld/examples/test-run +++ b/libmysqld/examples/test-run @@ -10,7 +10,7 @@ top_builddir=../.. mysql_test_dir=$top_builddir/mysql-test examples=$top_builddir/libmysqld/examples -mysqltest=$examples/mysqltest +mysqltest=$examples/mysqltest_embedded datadir=$mysql_test_dir/var/master-data test_data_dir=test gdb=0 |