diff options
| author | sasha@mysql.sashanet.com <> | 2002-01-19 22:46:25 -0700 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2002-01-19 22:46:25 -0700 |
| commit | 684f13ef4c20cc1843c615ee17a8013f65617442 (patch) | |
| tree | 254bb1b067e503a819145fff488d83709bf9c798 /.bzrignore | |
| parent | d7ad2cbe5b55d422affe8d180d0cc8dab1c518e1 (diff) | |
| parent | 56129ce634088b51dd60381711519c9125e8df72 (diff) | |
| download | mariadb-git-684f13ef4c20cc1843c615ee17a8013f65617442.tar.gz | |
Ugly merge! But I am not done yet - there are a number of things I need to fix
before I can push
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index e2939d2ed59..74d42b6b0fe 100644 --- a/.bzrignore +++ b/.bzrignore @@ -245,6 +245,7 @@ libmysqld/get_password.c libmysqld/ha_berkeley.cc libmysqld/ha_heap.cc libmysqld/ha_innobase.cc +libmysqld/ha_innodb.cc libmysqld/ha_isam.cc libmysqld/ha_isammrg.cc libmysqld/ha_myisam.cc @@ -344,7 +345,13 @@ mysql-test/gmon.out mysql-test/install_test_db mysql-test/mysql-test-run mysql-test/r/*.reject +mysql-test/r/rpl000002.eval +mysql-test/r/rpl000014.eval +mysql-test/r/rpl000015.eval +mysql-test/r/rpl000016.eval mysql-test/r/rpl_log.eval +mysql-test/r/slave-running.eval +mysql-test/r/slave-stopped.eval mysql-test/share/mysql mysql-test/var/* mysql.kdevprj @@ -451,4 +458,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -libmysqld/ha_innodb.cc |