diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-01-24 14:10:48 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-01-24 14:10:48 +0100 |
| commit | b114f4ef8198dc34b0f15c8371363700af6ceae9 (patch) | |
| tree | 7ac44dab0ce589c83d422e1c0871efa3c3e492ff /mysql-test/t/user_var-binlog.test | |
| parent | ded8417d58c96f05c6327ef8eceaf90482cbfd5e (diff) | |
| parent | d40f7056ae4075339b1adefdadc990fcf4e5f4d0 (diff) | |
| download | mariadb-git-b114f4ef8198dc34b0f15c8371363700af6ceae9.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
Auto merged
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_EE_err.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_stm_charset.test:
Auto merged
mysql-test/r/backup.result:
Auto merged
mysql-test/r/loaddata.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/rpl_loaddata_s.result:
Auto merged
mysql-test/r/rpl_replicate_do.result:
Auto merged
mysql-test/r/rpl_rewrt_db.result:
Auto merged
mysql-test/r/rpl_stm_000001.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/r/warnings.result:
Auto merged
mysql-test/t/backup.test:
Auto merged
mysql-test/t/loaddata.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/ndb_autodiscover.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/rpl_000015-slave.sh:
Auto merged
mysql-test/t/rpl_flushlog_loop-master.opt:
Auto merged
mysql-test/t/rpl_flushlog_loop-master.sh:
Auto merged
mysql-test/t/rpl_flushlog_loop-slave.opt:
Auto merged
mysql-test/t/rpl_flushlog_loop-slave.sh:
Auto merged
mysql-test/t/rpl_loaddata_s.test:
Auto merged
mysql-test/t/rpl_replicate_do.test:
Auto merged
mysql-test/t/rpl_rewrt_db.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/sp-destruct.test:
Auto merged
mysql-test/t/symlink.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
mysql-test/t/user_var-binlog.test:
Auto merged
mysql-test/t/view.test:
Auto merged
mysql-test/t/warnings.test:
Auto merged
mysql-test/mysql-test-run.pl:
Merge 5.0 -> 5.1
mysql-test/r/binlog_stm_blackhole.result:
Merge 5.0 -> 5.1
mysql-test/r/mysqltest.result:
Merge 5.0 -> 5.1
mysql-test/r/rpl_loaddata.result:
Merge 5.0 -> 5.1
mysql-test/r/rpl_loaddata_m.result:
Merge 5.0 -> 5.1
mysql-test/r/rpl_stm_log.result:
Merge 5.0 -> 5.1
mysql-test/r/rpl_timezone.result:
Merge 5.0 -> 5.1
mysql-test/t/mysqlbinlog.test:
Merge 5.0 -> 5.1
mysql-test/t/mysqlbinlog2.test:
Merge 5.0 -> 5.1
mysql-test/t/mysqltest.test:
Merge 5.0 -> 5.1
mysql-test/t/rpl_drop_db.test:
Merge 5.0 -> 5.1
mysql-test/t/rpl_loaddata.test:
Merge 5.0 -> 5.1
mysql-test/t/rpl_loaddata_m.test:
Merge 5.0 -> 5.1
mysql-test/t/rpl_timezone.test:
Merge 5.0 -> 5.1
mysql-test/t/trigger-compat.test:
Merge 5.0 -> 5.1
mysql-test/t/trigger-grant.test:
Merge 5.0 -> 5.1
Diffstat (limited to 'mysql-test/t/user_var-binlog.test')
| -rw-r--r-- | mysql-test/t/user_var-binlog.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/user_var-binlog.test b/mysql-test/t/user_var-binlog.test index a3128064c91..a7726c990f1 100644 --- a/mysql-test/t/user_var-binlog.test +++ b/mysql-test/t/user_var-binlog.test @@ -19,7 +19,7 @@ show binlog events from 102; # absolutely need variables names to be quoted and strings to be # escaped). --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 +--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001 drop table t1; # End of 4.1 tests |