diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-28 19:39:30 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-28 19:39:30 +0200 |
| commit | 3358cdd5048671ee6cbbf50c291f7e0d0fda8e1e (patch) | |
| tree | da0e622896425203d23ecdfd1bc77b57e3502edf /.bzrignore | |
| parent | 869f5d0e81d5cbecaec3605f292fbb363b9ccbf6 (diff) | |
| parent | f83e594218a6d19da2fa1ea2a01d860c30fe2913 (diff) | |
| download | mariadb-git-3358cdd5048671ee6cbbf50c291f7e0d0fda8e1e.tar.gz | |
Merge with 5.1 to get in changes from MySQL 5.1.55
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index d450bb9594a..0a28dc4af94 100644 --- a/.bzrignore +++ b/.bzrignore @@ -22,6 +22,7 @@ *.lai *.lib *.lo +*.manifest *.map *.o *.obj @@ -96,7 +97,8 @@ BitKeeper/tmp/gone BitKeeper/tmp BitKeeper/log BitKeeper/etc/SCCS -CMakeFiles/ +CMakeFiles/* +CMakeFiles COPYING COPYING.LIB Docs/#manual.texi# @@ -156,6 +158,7 @@ Makefile Makefile.in Makefile.in' PENDING/* +scripts/scripts TAGS ac_available_languages_fragment acinclude.m4 @@ -1224,9 +1227,11 @@ sql-bench/test-transactions sql-bench/test-wisconsin sql/*.cpp sql/*.ds? +sql/*.def sql/*.vcproj sql/.gdbinit sql/client.c +sql/cmake_dummy.cc sql/Doxyfile sql/f.c sql/gen_lex_hash @@ -1888,6 +1893,7 @@ vio/viotest.cpp win/configure.data win/vs71cache.txt win/vs8cache.txt +win/nmake_cache.txt ylwrap zlib/*.ds? zlib/*.vcproj @@ -1938,3 +1944,6 @@ libmysqld/create_options.cc storage/pbxt/bin/xtstat mysql-test/mtr_command scripts/convert-debug-for-diff +client/strings_def.h +libmysql/strings_def.h +libmysql_r/strings_def.h |