diff options
| author | unknown <msvensson@pilot.(none)> | 2007-06-07 19:48:34 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-06-07 19:48:34 +0200 |
| commit | bc35e6a779fae7efdb4eb4d025cc039d3b006047 (patch) | |
| tree | d9af2a6828e92844c2153f16b1873bab1ce80d19 /mysql-test/t/ps.test | |
| parent | f78d5ab66607255c9052b8833cf42bf1bfa99ffb (diff) | |
| parent | c01c90474935d172ae6807b55d1836180a4ddc75 (diff) | |
| download | mariadb-git-bc35e6a779fae7efdb4eb4d025cc039d3b006047.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/bug28369/my51-bug28369
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/extra/binlog_tests/blackhole.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/ndb_binlog_basic2.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
Diffstat (limited to 'mysql-test/t/ps.test')
| -rw-r--r-- | mysql-test/t/ps.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index 3239109b1be..394f44bbc83 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -1,4 +1,5 @@ -- source include/not_embedded.inc +-- source include/have_log_bin.inc # # SQL Syntax for Prepared Statements test # |