diff options
| author | unknown <kostja@bodhi.local> | 2006-08-14 16:30:57 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-08-14 16:30:57 +0400 |
| commit | 021cea21fdbfe50db647fe2ab3606f1e075c0654 (patch) | |
| tree | 213e7c7f15ac23c498fb6ddc5dd3d27425757f43 /.bzrignore | |
| parent | 2f48a59124c776c36ea6609f31543bf6c5f8ed86 (diff) | |
| parent | 675a5b776d693b64d72227dea86f51cb9ca31781 (diff) | |
| download | mariadb-git-021cea21fdbfe50db647fe2ab3606f1e075c0654.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/sql_db.cc:
Manual merge.
sql/sql_show.cc:
Manual merge.
sql/sql_table.cc:
Manual merge.
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 90e966390d2..1cf0cf7b889 100644 --- a/.bzrignore +++ b/.bzrignore @@ -943,6 +943,7 @@ ndb/src/common/mgmcommon/printConfig/*.d ndb/src/common/portlib/libportlib.dsp ndb/src/common/transporter/libtransporter.dsp ndb/src/common/util/libgeneral.dsp +ndb/src/common/util/testBitmask.cpp ndb/src/cw/cpcd/ndb_cpcd ndb/src/dummy.cpp ndb/src/kernel/blocks/backup/libbackup.dsp |