diff options
| author | unknown <iggy@amd64.(none)> | 2007-08-03 21:44:59 -0400 |
|---|---|---|
| committer | unknown <iggy@amd64.(none)> | 2007-08-03 21:44:59 -0400 |
| commit | e8469adb1782b7c9bc4b79aae000ac7e640828d9 (patch) | |
| tree | 8a56836c31dc997c4350174acfc4c641d741f298 /.bzrignore | |
| parent | a455d7f97edd31ac51b11e5bdd002197d04816dc (diff) | |
| parent | ac107ac16ae28fa8ec293e234e43fc6f04b67590 (diff) | |
| download | mariadb-git-e8469adb1782b7c9bc4b79aae000ac7e640828d9.tar.gz | |
Merge amd64.(none):/src/mysql-5.1-maint
into amd64.(none):/src/mysql-5.1-build_29903
BitKeeper/etc/ignore:
auto-union
client/client_priv.h:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~5b8836e4:
Auto merged
client/mysql.cc:
Auto merged
libmysqld/CMakeLists.txt:
Auto merged
libmysqld/Makefile.am:
Auto merged
libmysqld/examples/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2eb9019b:
Manual merge.
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index af4feb9a5b8..c38cb22d0fd 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1099,6 +1099,7 @@ libmysqld/item_sum.cc libmysqld/item_timefunc.cc libmysqld/item_uniq.cc libmysqld/key.cc +libmysqld/lex_hash.h libmysqld/lib_sql.cpp libmysqld/libmysql.c libmysqld/link_sources @@ -1107,6 +1108,8 @@ libmysqld/log.cc libmysqld/log_event.cc libmysqld/log_event_old.cc libmysqld/md5.c +libmysqld/message.h +libmysqld/message.rc libmysqld/mf_iocache.cc libmysqld/mini_client.cc libmysqld/my_decimal.cc |