diff options
| author | unknown <serg@serg.mylan> | 2004-08-24 21:07:08 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-08-24 21:07:08 +0200 |
| commit | d5996e18edbf0aa2a7f04741751251ab72d31e6f (patch) | |
| tree | d42c151c3f26fb0b147911427d1c1effb9717585 /.bzrignore | |
| parent | 6b20f46abc65f8b3dd851df71d04b89cb0d3f208 (diff) | |
| parent | ac9d0ce119e62050185943e5f47fa91471c3bc29 (diff) | |
| download | mariadb-git-d5996e18edbf0aa2a7f04741751251ab72d31e6f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
BitKeeper/etc/ignore:
added support-files/my-innodb-heavy-4G.cnf
sql/sql_select.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 1a756801461..7d2c00136ef 100644 --- a/.bzrignore +++ b/.bzrignore @@ -907,3 +907,4 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl +support-files/my-innodb-heavy-4G.cnf |