diff options
| author | unknown <monty@mysql.com> | 2004-12-06 11:38:56 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-12-06 11:38:56 +0200 |
| commit | 796bd7de96a1d1ec422708b90df5328388201c10 (patch) | |
| tree | a7bb331b7dac7ac2b3cda915e99bb8c1333f4fec /.bzrignore | |
| parent | 289d3b2ee0f912dd4f128e1c61685d7bb170eb90 (diff) | |
| parent | f8cdf570979c550ef04c53f691118ed2b1296a7c (diff) | |
| download | mariadb-git-796bd7de96a1d1ec422708b90df5328388201c10.tar.gz | |
Merge with 4.1
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
Build-tools/Do-compile:
Auto merged
client/mysqladmin.cc:
Auto merged
configure.in:
Auto merged
innobase/include/lock0lock.h:
Auto merged
innobase/os/os0file.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/insert_select.result:
Auto merged
mysql-test/r/lowercase_table3.result:
Auto merged
mysql-test/r/rpl_start_stop_slave.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/rpl_until.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisam.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/log_event.cc:
Merge with 4.1
Trivial cleanup
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 2893e947cf8..f675b1a9e5a 100644 --- a/.bzrignore +++ b/.bzrignore @@ -387,7 +387,9 @@ libmysqld/field_conv.cc libmysqld/filesort.cc libmysqld/get_password.c libmysqld/gstream.cc +libmysqld/ha_archive.cc libmysqld/ha_berkeley.cc +libmysqld/ha_example.cc libmysqld/ha_heap.cc libmysqld/ha_innobase.cc libmysqld/ha_innodb.cc @@ -395,6 +397,7 @@ libmysqld/ha_isam.cc libmysqld/ha_isammrg.cc libmysqld/ha_myisam.cc libmysqld/ha_myisammrg.cc +libmysqld/ha_tina.cc libmysqld/handler.cc libmysqld/hash_filo.cc libmysqld/hostname.cc |