diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-01 14:53:32 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-01 14:53:32 +0100 |
| commit | 8fa6ce58605c8215084bbb4d9de490bbcf7fa670 (patch) | |
| tree | 33c5bed5605f87c9b98fa1a2b05c7fb3f1a63415 /.bzrignore | |
| parent | 245b9ad4b37bc08ecfe6aea748a3251db63e7236 (diff) | |
| parent | 793a137ddd737cd98d8d33efe54bcc218fd60c3f (diff) | |
| download | mariadb-git-8fa6ce58605c8215084bbb4d9de490bbcf7fa670.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
extra/comp_err.c:
Auto merged
include/my_pthread.h:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/mix2_myisam.result:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
sql/Makefile.am:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/tztime.cc:
Auto merged
client/mysqltest.c:
Manual merge
mysql-test/mysql-test-run.pl:
Manual merge
sql/mysqld.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 4ee902bbeb7..c91df60c99f 100644 --- a/.bzrignore +++ b/.bzrignore @@ -2666,6 +2666,7 @@ storage/ndb/src/mgmclient/test_cpcd/*.d storage/ndb/src/mgmsrv/ndb_mgmd storage/ndb/src/mgmsrv/ndb_mgmd.dsp storage/ndb/src/ndbapi/libndbapi.dsp +storage/ndb/src/ndbapi/ndberror_check storage/ndb/test/ndbapi/DbAsyncGenerator storage/ndb/test/ndbapi/DbCreate storage/ndb/test/ndbapi/bank/bankCreator |