diff options
| author | igor@rurik.mysql.com <> | 2003-12-23 02:24:12 -0800 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2003-12-23 02:24:12 -0800 |
| commit | c236568ac915e6c14a89302832870d518eac8911 (patch) | |
| tree | 5e777a4d18231796e5654856dfb16db8d8a4cd75 /.bzrignore | |
| parent | f9e2c6cd27268e72198bde3c1a71eb1273df335a (diff) | |
| parent | 2dab0b9cc132b80e2220960424ab74ced7250314 (diff) | |
| download | mariadb-git-c236568ac915e6c14a89302832870d518eac8911.tar.gz | |
Auto Merge
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index 2e4fafa52fd..b6bd0a25740 100644 --- a/.bzrignore +++ b/.bzrignore @@ -483,6 +483,7 @@ mysql-test/gmon.out mysql-test/install_test_db mysql-test/mysql-test-run mysql-test/r/*.reject +mysql-test/r/index_merge_load.result mysql-test/r/rpl000001.eval mysql-test/r/rpl000002.eval mysql-test/r/rpl000014.eval @@ -493,9 +494,11 @@ mysql-test/r/slave-running.eval mysql-test/r/slave-stopped.eval mysql-test/share/mysql mysql-test/std_data/*.pem +mysql-test/t/index_merge.load mysql-test/var/* mysql.kdevprj mysql.proj +mysql_priv.h mysqld.S mysqld.sym mysys/#mf_iocache.c# @@ -647,4 +650,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -mysql_priv.h |