diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2006-12-31 12:41:42 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2006-12-31 12:41:42 +0400 |
| commit | cbff25d04ae0d72c2a42d78aea33764d0818808e (patch) | |
| tree | 141237cc110455e8b067a8fc14d520bdf40aa4bf /libmysqld/examples | |
| parent | d73b5b8e83c1ae52e35e73d0338c296b9383e2b4 (diff) | |
| parent | a2fc58745115a17a8e12a9c46c9631e6d9576551 (diff) | |
| download | mariadb-git-cbff25d04ae0d72c2a42d78aea33764d0818808e.tar.gz | |
Merge mysql.com:/d2/hf/clean/my51-clean
into mysql.com:/d2/hf/common/my51-common
libmysqld/Makefile.am:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_insert.cc:
Auto merged
BitKeeper/deleted/.del-ps_not_windows.test:
Auto merged
storage/myisam/ha_myisam.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 |