diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-08-24 02:10:49 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-08-24 02:10:49 +0300 |
| commit | 839ebeca5ac7c46d53f39d41f57f264767a32c96 (patch) | |
| tree | 3c1a50943610a2b8a03201f53d1c39359fcc6b14 /.bzrignore | |
| parent | c216222b5a13aae392abc35849a6887a6aa48b1d (diff) | |
| parent | e089fcce4c67a715f3f2f5eec6a6d1b248a41106 (diff) | |
| download | mariadb-git-839ebeca5ac7c46d53f39d41f57f264767a32c96.tar.gz | |
merge with 3.23
BitKeeper/etc/ignore:
auto-union
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/rpl_rotate_logs-master.opt:
Auto merged
mysql-test/t/rpl_rotate_logs-slave-master-info.opt:
Auto merged
mysql-test/t/rpl_rotate_logs-slave.sh:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/.bzrignore b/.bzrignore index 8022245b859..6cfd4bcac5b 100644 --- a/.bzrignore +++ b/.bzrignore @@ -284,6 +284,7 @@ libmysqld/password.c libmysqld/procedure.cc libmysqld/records.cc libmysqld/repl_failsafe.cc +libmysqld/set_var.cc libmysqld/simple-test libmysqld/slave.cc libmysqld/sql_acl.cc @@ -357,6 +358,8 @@ myisam/myisamlog myisam/myisampack myisam/test1.MYD myisam/test1.MYI +myisam/test2.MYD +myisam/test2.MYI mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz mysql-4.0.2-alpha.tar.gz mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz @@ -424,6 +427,12 @@ sql-bench/copy-db sql-bench/crash-me sql-bench/gif/* sql-bench/graph-compare-results +sql-bench/innotest1 +sql-bench/innotest1a +sql-bench/innotest1b +sql-bench/innotest2 +sql-bench/innotest2a +sql-bench/innotest2b sql-bench/output/* sql-bench/run-all-tests sql-bench/server-cfg @@ -485,12 +494,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -sql-bench/innotest1 -sql-bench/innotest1a -sql-bench/innotest1b -sql-bench/innotest2 -sql-bench/innotest2a -sql-bench/innotest2b -myisam/test2.MYD -myisam/test2.MYI -libmysqld/set_var.cc |