diff options
| author | unknown <monty@mysql.com> | 2006-02-26 15:11:56 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-02-26 15:11:56 +0200 |
| commit | d25c405dc7a6d333a377b6803c18837e885303a9 (patch) | |
| tree | 493d3d9cb6f32fcc6ad0bf804993fd9c3481cd6a /mysql-test/mysql-test-run.sh | |
| parent | f7cf76fc80dd413c4d3adf09cba9ef223ffb1307 (diff) | |
| download | mariadb-git-d25c405dc7a6d333a377b6803c18837e885303a9.tar.gz | |
After merge fixes
BitKeeper/etc/ignore:
added storage/ndb/src/common/util/testBitmask.cpp
mysql-test/mysql-test-run.sh:
Add libmysql_r/.libs to path for shared libraries.
(Needed for mysqlimport)
mysql-test/r/ctype_cp932_notembedded.result:
After merge fix
mysql-test/r/func_system.result:
Version number on embedded server can be longer than 40
mysql-test/r/partition_mgm_err.result:
Move tests that require symlinks to partion_mgm_err2.test
mysql-test/r/query_cache.result:
Fix possible errors from previous tests
mysql-test/t/ctype_cp932_notembedded.test:
After merge fix
mysql-test/t/func_system.test:
Version number on embedded server can be longer than 40
mysql-test/t/partition_mgm_err.test:
Move tests that require symlinks to partion_mgm_err2.test
mysql-test/t/query_cache.test:
Fix possible errors from previous tests
mysys/my_symlink2.c:
More debugging
sql/event.cc:
Code cleanup
sql/event_executor.cc:
Ensure that event mutexes are properly cleared up
sql/mysqld.cc:
Ensure that event mutexes are properly cleared up
mysql-test/r/partition_mgm_err2.result:
New BitKeeper file ``mysql-test/r/partition_mgm_err2.result''
mysql-test/t/partition_mgm_err2.test:
New BitKeeper file ``mysql-test/t/partition_mgm_err2.test''
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 212f0b9beb4..ce62964a3c0 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -217,8 +217,8 @@ MY_LOG_DIR="$MYSQL_TEST_DIR/var/log" # # Set LD_LIBRARY_PATH if we are using shared libraries # -LD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$BASEDIR/zlib/.libs:$LD_LIBRARY_PATH" -DYLD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$BASEDIR/zlib/.libs:$DYLD_LIBRARY_PATH" +LD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$BASEDIR/libmysql_r/.libs:$BASEDIR/zlib/.libs:$LD_LIBRARY_PATH" +DYLD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$BASEDIR/libmysql_r/.libs:$BASEDIR/zlib/.libs:$DYLD_LIBRARY_PATH" export LD_LIBRARY_PATH DYLD_LIBRARY_PATH # |