diff options
| author | unknown <konstantin@mysql.com> | 2005-09-23 00:46:59 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-09-23 00:46:59 +0400 |
| commit | 38ebb6c638060bf31eccee86856f5b5855bd0f27 (patch) | |
| tree | c8753cbe4273232bc93f91ecd04ad7014cee9cdb /.bzrignore | |
| parent | 2fec728eb73cbd9177564faf4dc7ef64c9288a54 (diff) | |
| parent | ac9c1fa39bb770a568387c2bee08c8821abdbf92 (diff) | |
| download | mariadb-git-38ebb6c638060bf31eccee86856f5b5855bd0f27.tar.gz | |
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into mysql.com:/opt/local/work/mysql-5.0-root
BitKeeper/etc/ignore:
auto-union
include/my_sys.h:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/ctype_ujis.test:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 3932ed4d127..388dcac2ca6 100644 --- a/.bzrignore +++ b/.bzrignore @@ -478,6 +478,8 @@ libmysqld/sql_cache.cc libmysqld/sql_class.cc libmysqld/sql_command libmysqld/sql_crypt.cc +libmysqld/sql_cursor.cc +libmysqld/sql_cursor.h libmysqld/sql_db.cc libmysqld/sql_delete.cc libmysqld/sql_derived.cc |