diff options
author | unknown <monty@work.mysql.com> | 2001-06-12 14:12:35 +0200 |
---|---|---|
committer | unknown <monty@work.mysql.com> | 2001-06-12 14:12:35 +0200 |
commit | a9e6b975fcf37c491870b3bf18493d0351ffc34f (patch) | |
tree | a5f1c279fea2101ed23cc2fffa79f3517349aff2 /.bzrignore | |
parent | 64dc74a13d17b863f0ed69b4f7d621b1b5da48ce (diff) | |
parent | cdcc56705c89909a4077008640aebc894504e99d (diff) | |
download | mariadb-git-a9e6b975fcf37c491870b3bf18493d0351ffc34f.tar.gz |
merge
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
sql-bench/server-cfg.sh:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 01abc218748..788bb4dd86f 100644 --- a/.bzrignore +++ b/.bzrignore @@ -314,11 +314,15 @@ sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686 sql-bench/bench-count-distinct sql-bench/bench-init.pl sql-bench/compare-results +sql-bench/compare-results-all sql-bench/copy-db sql-bench/crash-me +sql-bench/gif/* +sql-bench/graph-compare-results sql-bench/output/* sql-bench/run-all-tests sql-bench/server-cfg +sql-bench/template.html sql-bench/test-ATIS sql-bench/test-alter-table sql-bench/test-big-tables |