diff options
| author | unknown <cmiller@zippy.(none)> | 2006-07-05 16:16:09 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-07-05 16:16:09 -0400 |
| commit | 30de4903ae2b9cd03bd5f853715e7fc7b648c2c7 (patch) | |
| tree | a0c67909c6e1a1b67caf4558144a68911d8dfb15 /mysql-test/t/log_state-master.opt | |
| parent | f92fd7c98adad9542e7d8d29ee24db504980541f (diff) | |
| parent | 2ef57b836248f945657c7bd0fe02fa7fe3660b54 (diff) | |
| download | mariadb-git-30de4903ae2b9cd03bd5f853715e7fc7b648c2c7.tar.gz | |
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
BUILD/compile-dist:
Auto merged
BitKeeper/deleted/.del-partition_innodb.result:
Auto merged
BitKeeper/deleted/.del-partition_innodb.test:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/create_not_windows.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/innodb_mysql.test:
Auto merged
mysql-test/t/partition.test:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/wait_timeout.test:
Auto merged
mysys/my_lib.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/unireg.cc:
Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
manuakl merge
mysql-test/lib/mtr_process.pl:
manuakl merge
mysql-test/mysql-test-run.pl:
manuakl merge
mysql-test/r/type_newdecimal.result:
manuakl merge
mysql-test/t/create.test:
manuakl merge
mysql-test/t/func_group.test:
manuakl merge
mysql-test/t/type_newdecimal.test:
manuakl merge
Diffstat (limited to 'mysql-test/t/log_state-master.opt')
| -rw-r--r-- | mysql-test/t/log_state-master.opt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/log_state-master.opt b/mysql-test/t/log_state-master.opt new file mode 100644 index 00000000000..445c6223d47 --- /dev/null +++ b/mysql-test/t/log_state-master.opt @@ -0,0 +1 @@ +--log-output=TABLE,FILE --log --general-log=0 --log-slow-queries --slow-query-log=0 |