Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, mysys/mf_keycache.c, mysql-test/t/*myisam*

since previous merge. MARIA_PAGECACHE_READS in maria-preload.test are down a little bit (5%), which must be a good
side-effect of some sql/ change.

1 files changed, 98 insertions, 1258 deletions

diff --git a/.bzrignore b/.bzrignore
index 8ea3b361c87..a7166d4551f 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,6 +1,7 @@
 *-t
 *.Plo
 *.Po
+*.Tpo
 *.a
 *.bb
 *.bbg
@@ -9,11 +10,14 @@
 *.core
 *.d
 *.da
+*.dll
 *.exe
+*.exp
 *.gcda
 *.gcno
 *.gcov
 *.idb
+*.ilk
 *.la
 *.lai
 *.lib
@@ -33,6 +37,9 @@
 *.user
 *.vcproj
 *.vcproj.cmake
+*.dsp
+*.Po
+*.Plo
 */*.dir/*
 */*_pure_*warnings
 */.deps
@@ -86,6 +93,9 @@ BitKeeper/post-commit-manual
 BitKeeper/tmp/*
 BitKeeper/tmp/bkr3sAHD
 BitKeeper/tmp/gone
+BitKeeper/tmp
+BitKeeper/log
+BitKeeper/etc/SCCS
 CMakeFiles/*
 COPYING
 COPYING.LIB
@@ -147,7 +157,6 @@ Makefile.in
 Makefile.in'
 PENDING/*
 TAGS
-VC++Files/client/mysql_amd64.dsp
 ac_available_languages_fragment
 acinclude.m4
 aclocal.m4
@@ -156,6 +165,7 @@ autom4te-2.53.cache/*
 autom4te-2.53.cache/output.0
 autom4te-2.53.cache/requests
 autom4te-2.53.cache/traces.0
+autom4te.cache
 autom4te.cache/*
 autom4te.cache/output.0
 autom4te.cache/requests
@@ -168,37 +178,9 @@ bdb/build_unix/*
 bdb/build_vxworks/db.h
 bdb/build_vxworks/db_int.h
 bdb/build_win32/db.h
-bdb/build_win32/db_archive.dsp
-bdb/build_win32/db_checkpoint.dsp
 bdb/build_win32/db_config.h
 bdb/build_win32/db_cxx.h
-bdb/build_win32/db_deadlock.dsp
-bdb/build_win32/db_dll.dsp
-bdb/build_win32/db_dump.dsp
 bdb/build_win32/db_int.h
-bdb/build_win32/db_java.dsp
-bdb/build_win32/db_load.dsp
-bdb/build_win32/db_perf.dsp
-bdb/build_win32/db_printlog.dsp
-bdb/build_win32/db_recover.dsp
-bdb/build_win32/db_stat.dsp
-bdb/build_win32/db_static.dsp
-bdb/build_win32/db_tcl.dsp
-bdb/build_win32/db_test.dsp
-bdb/build_win32/db_upgrade.dsp
-bdb/build_win32/db_verify.dsp
-bdb/build_win32/ex_access.dsp
-bdb/build_win32/ex_btrec.dsp
-bdb/build_win32/ex_env.dsp
-bdb/build_win32/ex_lock.dsp
-bdb/build_win32/ex_mpool.dsp
-bdb/build_win32/ex_tpcb.dsp
-bdb/build_win32/excxx_access.dsp
-bdb/build_win32/excxx_btrec.dsp
-bdb/build_win32/excxx_env.dsp
-bdb/build_win32/excxx_lock.dsp
-bdb/build_win32/excxx_mpool.dsp
-bdb/build_win32/excxx_tpcb.dsp
 bdb/build_win32/include.tcl
 bdb/build_win32/libdb.def
 bdb/build_win32/libdb.rc
@@ -311,48 +293,7 @@ build_tags.sh
 client/#mysql.cc#
 client/*.ds?
 client/*.vcproj
-client/.deps/base64.Po
-client/.deps/completion_hash.Po
-client/.deps/dummy.Po
-client/.deps/mf_tempdir.Po
-client/.deps/my_bit.Po
-client/.deps/my_bitmap.Po
-client/.deps/my_getsystime.Po
-client/.deps/my_new.Po
-client/.deps/my_user.Po
-client/.deps/my_vle.Po
-client/.deps/mysql.Po
-client/.deps/mysql_upgrade.Po
-client/.deps/mysqladmin.Po
-client/.deps/mysqlbinlog.Po
-client/.deps/mysqlcheck.Po
-client/.deps/mysqldump.Po
-client/.deps/mysqlimport.Po
-client/.deps/mysqlshow.Po
-client/.deps/mysqlslap.Po
-client/.deps/mysqltest.Po
-client/.deps/readline.Po
-client/.deps/sql_string.Po
 client/.libs -prune
-client/.libs/lt-mysql
-client/.libs/lt-mysqladmin
-client/.libs/lt-mysqlbinlog
-client/.libs/lt-mysqlcheck
-client/.libs/lt-mysqldump
-client/.libs/lt-mysqlimport
-client/.libs/lt-mysqlshow
-client/.libs/lt-mysqlslap
-client/.libs/lt-mysqltest
-client/.libs/mysql
-client/.libs/mysql_upgrade
-client/.libs/mysqladmin
-client/.libs/mysqlbinlog
-client/.libs/mysqlcheck
-client/.libs/mysqldump
-client/.libs/mysqlimport
-client/.libs/mysqlshow
-client/.libs/mysqlslap
-client/.libs/mysqltest
 client/completion_hash.cpp
 client/decimal.c
 client/insert_test
@@ -402,66 +343,9 @@ client_debug/*
 client_release/*
 client_test
 cmake_install.cmake
-cmd-line-utils/libedit/.deps/chared.Po
-cmd-line-utils/libedit/.deps/common.Po
-cmd-line-utils/libedit/.deps/el.Po
-cmd-line-utils/libedit/.deps/emacs.Po
-cmd-line-utils/libedit/.deps/fcns.Po
-cmd-line-utils/libedit/.deps/fgetln.Po
-cmd-line-utils/libedit/.deps/help.Po
-cmd-line-utils/libedit/.deps/hist.Po
-cmd-line-utils/libedit/.deps/history.Po
-cmd-line-utils/libedit/.deps/key.Po
-cmd-line-utils/libedit/.deps/map.Po
-cmd-line-utils/libedit/.deps/parse.Po
-cmd-line-utils/libedit/.deps/prompt.Po
-cmd-line-utils/libedit/.deps/read.Po
-cmd-line-utils/libedit/.deps/readline.Po
-cmd-line-utils/libedit/.deps/refresh.Po
-cmd-line-utils/libedit/.deps/search.Po
-cmd-line-utils/libedit/.deps/sig.Po
-cmd-line-utils/libedit/.deps/strlcat.Po
-cmd-line-utils/libedit/.deps/strlcpy.Po
-cmd-line-utils/libedit/.deps/term.Po
-cmd-line-utils/libedit/.deps/tokenizer.Po
-cmd-line-utils/libedit/.deps/tty.Po
-cmd-line-utils/libedit/.deps/unvis.Po
-cmd-line-utils/libedit/.deps/vi.Po
-cmd-line-utils/libedit/.deps/vis.Po
 cmd-line-utils/libedit/common.h
 cmd-line-utils/libedit/makelist
-cmd-line-utils/readline/.deps/bind.Po
-cmd-line-utils/readline/.deps/callback.Po
-cmd-line-utils/readline/.deps/compat.Po
-cmd-line-utils/readline/.deps/complete.Po
-cmd-line-utils/readline/.deps/display.Po
-cmd-line-utils/readline/.deps/funmap.Po
-cmd-line-utils/readline/.deps/histexpand.Po
-cmd-line-utils/readline/.deps/histfile.Po
-cmd-line-utils/readline/.deps/history.Po
-cmd-line-utils/readline/.deps/histsearch.Po
-cmd-line-utils/readline/.deps/input.Po
-cmd-line-utils/readline/.deps/isearch.Po
-cmd-line-utils/readline/.deps/keymaps.Po
-cmd-line-utils/readline/.deps/kill.Po
-cmd-line-utils/readline/.deps/macro.Po
-cmd-line-utils/readline/.deps/mbutil.Po
-cmd-line-utils/readline/.deps/misc.Po
-cmd-line-utils/readline/.deps/nls.Po
-cmd-line-utils/readline/.deps/parens.Po
-cmd-line-utils/readline/.deps/readline.Po
-cmd-line-utils/readline/.deps/rltty.Po
-cmd-line-utils/readline/.deps/savestring.Po
-cmd-line-utils/readline/.deps/search.Po
-cmd-line-utils/readline/.deps/shell.Po
-cmd-line-utils/readline/.deps/signals.Po
-cmd-line-utils/readline/.deps/terminal.Po
-cmd-line-utils/readline/.deps/text.Po
-cmd-line-utils/readline/.deps/tilde.Po
-cmd-line-utils/readline/.deps/undo.Po
-cmd-line-utils/readline/.deps/util.Po
-cmd-line-utils/readline/.deps/vi_mode.Po
-cmd-line-utils/readline/.deps/xmalloc.Po
+comments
 comon.h
 comp_err/*.ds?
 comp_err/*.vcproj
@@ -486,17 +370,13 @@ cscope.po.out
 db-*.*.*
 dbug/*.ds?
 dbug/*.vcproj
-dbug/.deps/dbug.Po
-dbug/.deps/dbug_analyze.Po
-dbug/.deps/factorial.Po
-dbug/.deps/my_main.Po
-dbug/.deps/sanity.Po
 dbug/dbug_analyze
 dbug/example*.r
 dbug/factorial
 dbug/factorial.r
 dbug/main.r
 dbug/output*.r
+dbug/tests
 dbug/user.ps
 dbug/user.t
 debian/control
@@ -506,15 +386,6 @@ emacs.h
 examples/*.ds?
 examples/*.vcproj
 examples/udf_example/udf_example.def
-extra/.deps/charset2html.Po
-extra/.deps/comp_err.Po
-extra/.deps/innochecksum.Po
-extra/.deps/my_print_defaults.Po
-extra/.deps/mysql_waitpid.Po
-extra/.deps/perror.Po
-extra/.deps/replace.Po
-extra/.deps/resolve_stack_dump.Po
-extra/.deps/resolveip.Po
 extra/charset2html
 extra/comp_err
 extra/created_include_files
@@ -531,54 +402,8 @@ extra/resolve_stack_dump
 extra/resolveip
 extra/sql_state.h
 extra/tztime.cc
-extra/yassl/src/.deps/buffer.Plo
-extra/yassl/src/.deps/cert_wrapper.Plo
-extra/yassl/src/.deps/crypto_wrapper.Plo
-extra/yassl/src/.deps/handshake.Plo
-extra/yassl/src/.deps/lock.Plo
-extra/yassl/src/.deps/log.Plo
-extra/yassl/src/.deps/socket_wrapper.Plo
-extra/yassl/src/.deps/ssl.Plo
-extra/yassl/src/.deps/template_instnt.Plo
-extra/yassl/src/.deps/timer.Plo
-extra/yassl/src/.deps/yassl_error.Plo
-extra/yassl/src/.deps/yassl_imp.Plo
-extra/yassl/src/.deps/yassl_int.Plo
-extra/yassl/taocrypt/benchmark/.deps/benchmark-benchmark.Po
 extra/yassl/taocrypt/benchmark/benchmark
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aes.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aestables.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-algebra.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-arc4.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-asn.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-bftables.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-blowfish.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-coding.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-des.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dh.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dsa.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-file.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-hash.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-integer.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md2.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md4.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md5.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-misc.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-random.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-ripemd.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-rsa.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-sha.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-template_instnt.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-tftables.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-twofish.Plo
-extra/yassl/taocrypt/test/.deps/test-test.Po
 extra/yassl/taocrypt/test/test
-extra/yassl/testsuite/.deps/testsuite-client.Po
-extra/yassl/testsuite/.deps/testsuite-echoclient.Po
-extra/yassl/testsuite/.deps/testsuite-echoserver.Po
-extra/yassl/testsuite/.deps/testsuite-server.Po
-extra/yassl/testsuite/.deps/testsuite-test.Po
-extra/yassl/testsuite/.deps/testsuite-testsuite.Po
 extra/yassl/testsuite/testsuite
 fcns.c
 fcns.h
@@ -643,130 +468,6 @@ lib_release/*
 libmysql/*.c
 libmysql/*.ds?
 libmysql/*.vcproj
-libmysql/.deps/array.Plo
-libmysql/.deps/bchange.Plo
-libmysql/.deps/bcmp.Plo
-libmysql/.deps/bmove.Plo
-libmysql/.deps/bmove_upp.Plo
-libmysql/.deps/charset-def.Plo
-libmysql/.deps/charset.Plo
-libmysql/.deps/client.Plo
-libmysql/.deps/conf_to_src.Po
-libmysql/.deps/ctype-big5.Plo
-libmysql/.deps/ctype-bin.Plo
-libmysql/.deps/ctype-cp932.Plo
-libmysql/.deps/ctype-czech.Plo
-libmysql/.deps/ctype-euc_kr.Plo
-libmysql/.deps/ctype-eucjpms.Plo
-libmysql/.deps/ctype-extra.Plo
-libmysql/.deps/ctype-gb2312.Plo
-libmysql/.deps/ctype-gbk.Plo
-libmysql/.deps/ctype-latin1.Plo
-libmysql/.deps/ctype-mb.Plo
-libmysql/.deps/ctype-simple.Plo
-libmysql/.deps/ctype-sjis.Plo
-libmysql/.deps/ctype-tis620.Plo
-libmysql/.deps/ctype-uca.Plo
-libmysql/.deps/ctype-ucs2.Plo
-libmysql/.deps/ctype-ujis.Plo
-libmysql/.deps/ctype-utf8.Plo
-libmysql/.deps/ctype-win1250ch.Plo
-libmysql/.deps/ctype.Plo
-libmysql/.deps/dbug.Plo
-libmysql/.deps/default.Plo
-libmysql/.deps/default_modify.Plo
-libmysql/.deps/errmsg.Plo
-libmysql/.deps/errors.Plo
-libmysql/.deps/get_password.Plo
-libmysql/.deps/hash.Plo
-libmysql/.deps/int2str.Plo
-libmysql/.deps/is_prefix.Plo
-libmysql/.deps/libmysql.Plo
-libmysql/.deps/list.Plo
-libmysql/.deps/llstr.Plo
-libmysql/.deps/longlong2str.Plo
-libmysql/.deps/manager.Plo
-libmysql/.deps/md5.Plo
-libmysql/.deps/mf_cache.Plo
-libmysql/.deps/mf_dirname.Plo
-libmysql/.deps/mf_fn_ext.Plo
-libmysql/.deps/mf_format.Plo
-libmysql/.deps/mf_iocache.Plo
-libmysql/.deps/mf_iocache2.Plo
-libmysql/.deps/mf_loadpath.Plo
-libmysql/.deps/mf_pack.Plo
-libmysql/.deps/mf_path.Plo
-libmysql/.deps/mf_tempfile.Plo
-libmysql/.deps/mf_unixpath.Plo
-libmysql/.deps/mf_wcomp.Plo
-libmysql/.deps/mulalloc.Plo
-libmysql/.deps/my_alloc.Plo
-libmysql/.deps/my_chsize.Plo
-libmysql/.deps/my_compress.Plo
-libmysql/.deps/my_create.Plo
-libmysql/.deps/my_delete.Plo
-libmysql/.deps/my_div.Plo
-libmysql/.deps/my_error.Plo
-libmysql/.deps/my_file.Plo
-libmysql/.deps/my_fopen.Plo
-libmysql/.deps/my_fstream.Plo
-libmysql/.deps/my_gethostbyname.Plo
-libmysql/.deps/my_getopt.Plo
-libmysql/.deps/my_getwd.Plo
-libmysql/.deps/my_init.Plo
-libmysql/.deps/my_lib.Plo
-libmysql/.deps/my_malloc.Plo
-libmysql/.deps/my_messnc.Plo
-libmysql/.deps/my_net.Plo
-libmysql/.deps/my_once.Plo
-libmysql/.deps/my_open.Plo
-libmysql/.deps/my_port.Plo
-libmysql/.deps/my_pread.Plo
-libmysql/.deps/my_pthread.Plo
-libmysql/.deps/my_read.Plo
-libmysql/.deps/my_realloc.Plo
-libmysql/.deps/my_rename.Plo
-libmysql/.deps/my_seek.Plo
-libmysql/.deps/my_sleep.Plo
-libmysql/.deps/my_static.Plo
-libmysql/.deps/my_strtoll10.Plo
-libmysql/.deps/my_symlink.Plo
-libmysql/.deps/my_thr_init.Plo
-libmysql/.deps/my_time.Plo
-libmysql/.deps/my_vsnprintf.Plo
-libmysql/.deps/my_write.Plo
-libmysql/.deps/net.Plo
-libmysql/.deps/pack.Plo
-libmysql/.deps/password.Plo
-libmysql/.deps/safemalloc.Plo
-libmysql/.deps/sha1.Plo
-libmysql/.deps/str2int.Plo
-libmysql/.deps/str_alloc.Plo
-libmysql/.deps/strcend.Plo
-libmysql/.deps/strcont.Plo
-libmysql/.deps/strend.Plo
-libmysql/.deps/strfill.Plo
-libmysql/.deps/string.Plo
-libmysql/.deps/strinstr.Plo
-libmysql/.deps/strmake.Plo
-libmysql/.deps/strmov.Plo
-libmysql/.deps/strnlen.Plo
-libmysql/.deps/strnmov.Plo
-libmysql/.deps/strtod.Plo
-libmysql/.deps/strtoll.Plo
-libmysql/.deps/strtoull.Plo
-libmysql/.deps/strxmov.Plo
-libmysql/.deps/strxnmov.Plo
-libmysql/.deps/thr_mutex.Plo
-libmysql/.deps/typelib.Plo
-libmysql/.deps/vio.Plo
-libmysql/.deps/viosocket.Plo
-libmysql/.deps/viossl.Plo
-libmysql/.deps/viosslfactories.Plo
-libmysql/.deps/xml.Plo
-libmysql/.libs/libmysqlclient.lai
-libmysql/.libs/libmysqlclient.so.15
-libmysql/.libs/libmysqlclient.so.15.0.0
 libmysql/conf_to_src
 libmysql/debug/libmysql.exp
 libmysql/libmysql.ver
@@ -779,130 +480,6 @@ libmysql/release/libmysql.exp
 libmysql/vio_priv.h
 libmysql/viosocket.o.6WmSJk
 libmysql_r/*.c
-libmysql_r/.deps/array.Plo
-libmysql_r/.deps/bchange.Plo
-libmysql_r/.deps/bcmp.Plo
-libmysql_r/.deps/bmove.Plo
-libmysql_r/.deps/bmove_upp.Plo
-libmysql_r/.deps/charset-def.Plo
-libmysql_r/.deps/charset.Plo
-libmysql_r/.deps/client.Plo
-libmysql_r/.deps/conf_to_src.Po
-libmysql_r/.deps/ctype-big5.Plo
-libmysql_r/.deps/ctype-bin.Plo
-libmysql_r/.deps/ctype-cp932.Plo
-libmysql_r/.deps/ctype-czech.Plo
-libmysql_r/.deps/ctype-euc_kr.Plo
-libmysql_r/.deps/ctype-eucjpms.Plo
-libmysql_r/.deps/ctype-extra.Plo
-libmysql_r/.deps/ctype-gb2312.Plo
-libmysql_r/.deps/ctype-gbk.Plo
-libmysql_r/.deps/ctype-latin1.Plo
-libmysql_r/.deps/ctype-mb.Plo
-libmysql_r/.deps/ctype-simple.Plo
-libmysql_r/.deps/ctype-sjis.Plo
-libmysql_r/.deps/ctype-tis620.Plo
-libmysql_r/.deps/ctype-uca.Plo
-libmysql_r/.deps/ctype-ucs2.Plo
-libmysql_r/.deps/ctype-ujis.Plo
-libmysql_r/.deps/ctype-utf8.Plo
-libmysql_r/.deps/ctype-win1250ch.Plo
-libmysql_r/.deps/ctype.Plo
-libmysql_r/.deps/dbug.Plo
-libmysql_r/.deps/default.Plo
-libmysql_r/.deps/default_modify.Plo
-libmysql_r/.deps/errmsg.Plo
-libmysql_r/.deps/errors.Plo
-libmysql_r/.deps/get_password.Plo
-libmysql_r/.deps/hash.Plo
-libmysql_r/.deps/int2str.Plo
-libmysql_r/.deps/is_prefix.Plo
-libmysql_r/.deps/libmysql.Plo
-libmysql_r/.deps/list.Plo
-libmysql_r/.deps/llstr.Plo
-libmysql_r/.deps/longlong2str.Plo
-libmysql_r/.deps/manager.Plo
-libmysql_r/.deps/md5.Plo
-libmysql_r/.deps/mf_cache.Plo
-libmysql_r/.deps/mf_dirname.Plo
-libmysql_r/.deps/mf_fn_ext.Plo
-libmysql_r/.deps/mf_format.Plo
-libmysql_r/.deps/mf_iocache.Plo
-libmysql_r/.deps/mf_iocache2.Plo
-libmysql_r/.deps/mf_loadpath.Plo
-libmysql_r/.deps/mf_pack.Plo
-libmysql_r/.deps/mf_path.Plo
-libmysql_r/.deps/mf_tempfile.Plo
-libmysql_r/.deps/mf_unixpath.Plo
-libmysql_r/.deps/mf_wcomp.Plo
-libmysql_r/.deps/mulalloc.Plo
-libmysql_r/.deps/my_alloc.Plo
-libmysql_r/.deps/my_chsize.Plo
-libmysql_r/.deps/my_compress.Plo
-libmysql_r/.deps/my_create.Plo
-libmysql_r/.deps/my_delete.Plo
-libmysql_r/.deps/my_div.Plo
-libmysql_r/.deps/my_error.Plo
-libmysql_r/.deps/my_file.Plo
-libmysql_r/.deps/my_fopen.Plo
-libmysql_r/.deps/my_fstream.Plo
-libmysql_r/.deps/my_gethostbyname.Plo
-libmysql_r/.deps/my_getopt.Plo
-libmysql_r/.deps/my_getwd.Plo
-libmysql_r/.deps/my_init.Plo
-libmysql_r/.deps/my_lib.Plo
-libmysql_r/.deps/my_malloc.Plo
-libmysql_r/.deps/my_messnc.Plo
-libmysql_r/.deps/my_net.Plo
-libmysql_r/.deps/my_once.Plo
-libmysql_r/.deps/my_open.Plo
-libmysql_r/.deps/my_port.Plo
-libmysql_r/.deps/my_pread.Plo
-libmysql_r/.deps/my_pthread.Plo
-libmysql_r/.deps/my_read.Plo
-libmysql_r/.deps/my_realloc.Plo
-libmysql_r/.deps/my_rename.Plo
-libmysql_r/.deps/my_seek.Plo
-libmysql_r/.deps/my_sleep.Plo
-libmysql_r/.deps/my_static.Plo
-libmysql_r/.deps/my_strtoll10.Plo
-libmysql_r/.deps/my_symlink.Plo
-libmysql_r/.deps/my_thr_init.Plo
-libmysql_r/.deps/my_time.Plo
-libmysql_r/.deps/my_vsnprintf.Plo
-libmysql_r/.deps/my_write.Plo
-libmysql_r/.deps/net.Plo
-libmysql_r/.deps/pack.Plo
-libmysql_r/.deps/password.Plo
-libmysql_r/.deps/safemalloc.Plo
-libmysql_r/.deps/sha1.Plo
-libmysql_r/.deps/str2int.Plo
-libmysql_r/.deps/str_alloc.Plo
-libmysql_r/.deps/strcend.Plo
-libmysql_r/.deps/strcont.Plo
-libmysql_r/.deps/strend.Plo
-libmysql_r/.deps/strfill.Plo
-libmysql_r/.deps/string.Plo
-libmysql_r/.deps/strinstr.Plo
-libmysql_r/.deps/strmake.Plo
-libmysql_r/.deps/strmov.Plo
-libmysql_r/.deps/strnlen.Plo
-libmysql_r/.deps/strnmov.Plo
-libmysql_r/.deps/strtod.Plo
-libmysql_r/.deps/strtoll.Plo
-libmysql_r/.deps/strtoull.Plo
-libmysql_r/.deps/strxmov.Plo
-libmysql_r/.deps/strxnmov.Plo
-libmysql_r/.deps/thr_mutex.Plo
-libmysql_r/.deps/typelib.Plo
-libmysql_r/.deps/vio.Plo
-libmysql_r/.deps/viosocket.Plo
-libmysql_r/.deps/viossl.Plo
-libmysql_r/.deps/viosslfactories.Plo
-libmysql_r/.deps/xml.Plo
-libmysql_r/.libs/libmysqlclient_r.lai
-libmysql_r/.libs/libmysqlclient_r.so.15
-libmysql_r/.libs/libmysqlclient_r.so.15.0.0
 libmysql_r/acconfig.h
 libmysql_r/client_settings.h
 libmysql_r/conf_to_src
@@ -912,123 +489,6 @@ libmysql_r/mysys_priv.h
 libmysql_r/vio_priv.h
 libmysqld/*.ds?
 libmysqld/*.vcproj
-libmysqld/.deps/client.Po
-libmysqld/.deps/derror.Po
-libmysqld/.deps/discover.Po
-libmysqld/.deps/emb_qcache.Po
-libmysqld/.deps/errmsg.Po
-libmysqld/.deps/event_data_objects.Po
-libmysqld/.deps/event_db_repository.Po
-libmysqld/.deps/event_queue.Po
-libmysqld/.deps/event_scheduler.Po
-libmysqld/.deps/events.Po
-libmysqld/.deps/field.Po
-libmysqld/.deps/field_conv.Po
-libmysqld/.deps/filesort.Po
-libmysqld/.deps/get_password.Po
-libmysqld/.deps/gstream.Po
-libmysqld/.deps/ha_berkeley.Po
-libmysqld/.deps/ha_federated.Po
-libmysqld/.deps/ha_heap.Po
-libmysqld/.deps/ha_innodb.Po
-libmysqld/.deps/ha_myisam.Po
-libmysqld/.deps/ha_myisammrg.Po
-libmysqld/.deps/ha_ndbcluster.Po
-libmysqld/.deps/ha_ndbcluster_binlog.Po
-libmysqld/.deps/ha_partition.Po
-libmysqld/.deps/handler.Po
-libmysqld/.deps/hash_filo.Po
-libmysqld/.deps/hostname.Po
-libmysqld/.deps/init.Po
-libmysqld/.deps/item.Po
-libmysqld/.deps/item_buff.Po
-libmysqld/.deps/item_cmpfunc.Po
-libmysqld/.deps/item_create.Po
-libmysqld/.deps/item_func.Po
-libmysqld/.deps/item_geofunc.Po
-libmysqld/.deps/item_row.Po
-libmysqld/.deps/item_strfunc.Po
-libmysqld/.deps/item_subselect.Po
-libmysqld/.deps/item_sum.Po
-libmysqld/.deps/item_timefunc.Po
-libmysqld/.deps/item_uniq.Po
-libmysqld/.deps/item_xmlfunc.Po
-libmysqld/.deps/key.Po
-libmysqld/.deps/lib_sql.Po
-libmysqld/.deps/libmysql.Po
-libmysqld/.deps/libmysqld.Po
-libmysqld/.deps/lock.Po
-libmysqld/.deps/log.Po
-libmysqld/.deps/log_event.Po
-libmysqld/.deps/my_decimal.Po
-libmysqld/.deps/my_time.Po
-libmysqld/.deps/my_user.Po
-libmysqld/.deps/net_serv.Po
-libmysqld/.deps/opt_range.Po
-libmysqld/.deps/opt_sum.Po
-libmysqld/.deps/pack.Po
-libmysqld/.deps/parse_file.Po
-libmysqld/.deps/partition_info.Po
-libmysqld/.deps/password.Po
-libmysqld/.deps/procedure.Po
-libmysqld/.deps/protocol.Po
-libmysqld/.deps/records.Po
-libmysqld/.deps/rpl_filter.Po
-libmysqld/.deps/rpl_injector.Po
-libmysqld/.deps/set_var.Po
-libmysqld/.deps/sp.Po
-libmysqld/.deps/sp_cache.Po
-libmysqld/.deps/sp_head.Po
-libmysqld/.deps/sp_pcontext.Po
-libmysqld/.deps/sp_rcontext.Po
-libmysqld/.deps/spatial.Po
-libmysqld/.deps/sql_acl.Po
-libmysqld/.deps/sql_analyse.Po
-libmysqld/.deps/sql_base.Po
-libmysqld/.deps/sql_builtin.Po
-libmysqld/.deps/sql_cache.Po
-libmysqld/.deps/sql_class.Po
-libmysqld/.deps/sql_crypt.Po
-libmysqld/.deps/sql_cursor.Po
-libmysqld/.deps/sql_db.Po
-libmysqld/.deps/sql_delete.Po
-libmysqld/.deps/sql_derived.Po
-libmysqld/.deps/sql_do.Po
-libmysqld/.deps/sql_error.Po
-libmysqld/.deps/sql_handler.Po
-libmysqld/.deps/sql_help.Po
-libmysqld/.deps/sql_insert.Po
-libmysqld/.deps/sql_lex.Po
-libmysqld/.deps/sql_list.Po
-libmysqld/.deps/sql_load.Po
-libmysqld/.deps/sql_manager.Po
-libmysqld/.deps/sql_map.Po
-libmysqld/.deps/sql_parse.Po
-libmysqld/.deps/sql_partition.Po
-libmysqld/.deps/sql_plugin.Po
-libmysqld/.deps/sql_prepare.Po
-libmysqld/.deps/sql_rename.Po
-libmysqld/.deps/sql_select.Po
-libmysqld/.deps/sql_show.Po
-libmysqld/.deps/sql_state.Po
-libmysqld/.deps/sql_string.Po
-libmysqld/.deps/sql_table.Po
-libmysqld/.deps/sql_tablespace.Po
-libmysqld/.deps/sql_test.Po
-libmysqld/.deps/sql_trigger.Po
-libmysqld/.deps/sql_udf.Po
-libmysqld/.deps/sql_union.Po
-libmysqld/.deps/sql_update.Po
-libmysqld/.deps/sql_view.Po
-libmysqld/.deps/sql_yacc.Po
-libmysqld/.deps/stacktrace.Po
-libmysqld/.deps/strfunc.Po
-libmysqld/.deps/table.Po
-libmysqld/.deps/thr_malloc.Po
-libmysqld/.deps/time.Po
-libmysqld/.deps/tztime.Po
-libmysqld/.deps/uniques.Po
-libmysqld/.deps/unireg.Po
 libmysqld/backup_dir
 libmysqld/client.c
 libmysqld/client_settings.h
@@ -1046,11 +506,6 @@ libmysqld/event_queue.cc
 libmysqld/event_scheduler.cc
 libmysqld/event_timed.cc
 libmysqld/events.cc
-libmysqld/examples/.deps/completion_hash.Po
-libmysqld/examples/.deps/mysql.Po
-libmysqld/examples/.deps/mysql_client_test.Po
-libmysqld/examples/.deps/mysqltest.Po
-libmysqld/examples/.deps/readline.Po
 libmysqld/examples/client_test.c
 libmysqld/examples/client_test.cc
 libmysqld/examples/completion_hash.cc
@@ -1083,6 +538,7 @@ libmysqld/ha_innobase.cc
 libmysqld/ha_innodb.cc
 libmysqld/ha_isam.cc
 libmysqld/ha_isammrg.cc
+libmysqld/ha_maria.cc
 libmysqld/ha_myisam.cc
 libmysqld/ha_myisammrg.cc
 libmysqld/ha_ndbcluster.cc
@@ -1224,7 +680,11 @@ linked_server_sources
 linked_tools_sources
 locked
 ltmain.sh
+ma_test_recovery.output
 man/*.1
+maria-win.patch
+maria_log.00000*
+maria_log_control
 merge/*.ds?
 merge/*.vcproj
 missing
@@ -1287,7 +747,6 @@ mysql-test/*.vcproj
 mysql-test/.DS_Store
 mysql-test/funcs_1.log
 mysql-test/funcs_1.tar
-mysql-test/gmon.out
 mysql-test/install_test_db
 mysql-test/lib/init_db.sql
 mysql-test/linux_sys_vars.inc
@@ -1422,120 +881,6 @@ mysqlserver/*.vcproj
 mysys/#mf_iocache.c#
 mysys/*.ds?
 mysys/*.vcproj
-mysys/.deps/array.Po
-mysys/.deps/base64.Po
-mysys/.deps/charset-def.Po
-mysys/.deps/charset.Po
-mysys/.deps/checksum.Po
-mysys/.deps/default.Po
-mysys/.deps/default_modify.Po
-mysys/.deps/errors.Po
-mysys/.deps/hash.Po
-mysys/.deps/list.Po
-mysys/.deps/md5.Po
-mysys/.deps/mf_brkhant.Po
-mysys/.deps/mf_cache.Po
-mysys/.deps/mf_dirname.Po
-mysys/.deps/mf_fn_ext.Po
-mysys/.deps/mf_format.Po
-mysys/.deps/mf_getdate.Po
-mysys/.deps/mf_iocache.Po
-mysys/.deps/mf_iocache2.Po
-mysys/.deps/mf_keycache.Po
-mysys/.deps/mf_keycaches.Po
-mysys/.deps/mf_loadpath.Po
-mysys/.deps/mf_pack.Po
-mysys/.deps/mf_path.Po
-mysys/.deps/mf_qsort.Po
-mysys/.deps/mf_qsort2.Po
-mysys/.deps/mf_radix.Po
-mysys/.deps/mf_same.Po
-mysys/.deps/mf_sort.Po
-mysys/.deps/mf_strip.Po
-mysys/.deps/mf_tempdir.Po
-mysys/.deps/mf_tempfile.Po
-mysys/.deps/mf_unixpath.Po
-mysys/.deps/mf_wcomp.Po
-mysys/.deps/mf_wfile.Po
-mysys/.deps/mulalloc.Po
-mysys/.deps/my_access.Po
-mysys/.deps/my_aes.Po
-mysys/.deps/my_alarm.Po
-mysys/.deps/my_alloc.Po
-mysys/.deps/my_append.Po
-mysys/.deps/my_atomic.Po
-mysys/.deps/my_bit.Po
-mysys/.deps/my_bitmap.Po
-mysys/.deps/my_chsize.Po
-mysys/.deps/my_clock.Po
-mysys/.deps/my_compress.Po
-mysys/.deps/my_copy.Po
-mysys/.deps/my_crc32.Po
-mysys/.deps/my_create.Po
-mysys/.deps/my_delete.Po
-mysys/.deps/my_div.Po
-mysys/.deps/my_dup.Po
-mysys/.deps/my_error.Po
-mysys/.deps/my_file.Po
-mysys/.deps/my_fopen.Po
-mysys/.deps/my_fstream.Po
-mysys/.deps/my_gethostbyname.Po
-mysys/.deps/my_gethwaddr.Po
-mysys/.deps/my_getncpus.Po
-mysys/.deps/my_getopt.Po
-mysys/.deps/my_getsystime.Po
-mysys/.deps/my_getwd.Po
-mysys/.deps/my_handler.Po
-mysys/.deps/my_init.Po
-mysys/.deps/my_largepage.Po
-mysys/.deps/my_lib.Po
-mysys/.deps/my_libwrap.Po
-mysys/.deps/my_lock.Po
-mysys/.deps/my_lockmem.Po
-mysys/.deps/my_lread.Po
-mysys/.deps/my_lwrite.Po
-mysys/.deps/my_malloc.Po
-mysys/.deps/my_memmem.Po
-mysys/.deps/my_messnc.Po
-mysys/.deps/my_mkdir.Po
-mysys/.deps/my_mmap.Po
-mysys/.deps/my_net.Po
-mysys/.deps/my_netware.Po
-mysys/.deps/my_new.Po
-mysys/.deps/my_once.Po
-mysys/.deps/my_open.Po
-mysys/.deps/my_port.Po
-mysys/.deps/my_pread.Po
-mysys/.deps/my_pthread.Po
-mysys/.deps/my_quick.Po
-mysys/.deps/my_read.Po
-mysys/.deps/my_realloc.Po
-mysys/.deps/my_redel.Po
-mysys/.deps/my_rename.Po
-mysys/.deps/my_seek.Po
-mysys/.deps/my_semaphore.Po
-mysys/.deps/my_sleep.Po
-mysys/.deps/my_static.Po
-mysys/.deps/my_symlink.Po
-mysys/.deps/my_symlink2.Po
-mysys/.deps/my_sync.Po
-mysys/.deps/my_thr_init.Po
-mysys/.deps/my_vle.Po
-mysys/.deps/my_windac.Po
-mysys/.deps/my_write.Po
-mysys/.deps/ptr_cmp.Po
-mysys/.deps/queues.Po
-mysys/.deps/rijndael.Po
-mysys/.deps/safemalloc.Po
-mysys/.deps/sha1.Po
-mysys/.deps/string.Po
-mysys/.deps/thr_alarm.Po
-mysys/.deps/thr_lock.Po
-mysys/.deps/thr_mutex.Po
-mysys/.deps/thr_rwlock.Po
-mysys/.deps/tree.Po
-mysys/.deps/trie.Po
-mysys/.deps/typelib.Po
 mysys/charset2html
 mysys/getopt.c
 mysys/getopt1.c
@@ -1678,48 +1023,16 @@ ndb/lib/libNEWTON_BASICTEST_COMMON.so
 ndb/lib/libREP_API.so
 ndb/lib/libndbclient.so
 ndb/lib/libndbclient_extra.so
-ndb/src/common/debugger/libtrace.dsp
-ndb/src/common/debugger/signaldata/libsignaldataprint.dsp
-ndb/src/common/logger/liblogger.dsp
-ndb/src/common/mgmcommon/libmgmsrvcommon.dsp
 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
 ndb/src/kernel/blocks/backup/restore/ndb_restore
-ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
-ndb/src/kernel/blocks/dbacc/libdbacc.dsp
-ndb/src/kernel/blocks/dbdict/libdbdict.dsp
-ndb/src/kernel/blocks/dbdih/libdbdih.dsp
-ndb/src/kernel/blocks/dblqh/libdblqh.dsp
-ndb/src/kernel/blocks/dbtc/libdbtc.dsp
-ndb/src/kernel/blocks/dbtup/libdbtup.dsp
-ndb/src/kernel/blocks/dbtux/libdbtux.dsp
-ndb/src/kernel/blocks/dbutil/libdbutil.dsp
-ndb/src/kernel/blocks/grep/libgrep.dsp
-ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp
-ndb/src/kernel/blocks/ndbfs/libndbfs.dsp
-ndb/src/kernel/blocks/qmgr/libqmgr.dsp
-ndb/src/kernel/blocks/suma/libsuma.dsp
-ndb/src/kernel/blocks/trix/libtrix.dsp
-ndb/src/kernel/error/liberror.dsp
 ndb/src/kernel/ndbd
-ndb/src/kernel/ndbd.dsp
-ndb/src/kernel/vm/libkernel.dsp
 ndb/src/libndb.ver
-ndb/src/libndbclient.dsp
-ndb/src/mgmapi/libmgmapi.dsp
-ndb/src/mgmclient/libndbmgmclient.dsp
 ndb/src/mgmclient/ndb_mgm
-ndb/src/mgmclient/ndb_mgm.dsp
 ndb/src/mgmclient/test_cpcd/*.d
 ndb/src/mgmsrv/ndb_mgmd
-ndb/src/mgmsrv/ndb_mgmd.dsp
-ndb/src/ndbapi/libndbapi.dsp
 ndb/test/ndbapi/bank/bankCreator
 ndb/test/ndbapi/bank/bankMakeGL
 ndb/test/ndbapi/bank/bankSumAccounts
@@ -1732,15 +1045,12 @@ ndb/test/ndbapi/create_tab
 ndb/test/ndbapi/drop_all_tabs
 ndb/test/ndbapi/flexAsynch
 ndb/test/ndbapi/flexBench
-ndb/test/ndbapi/flexBench.dsp
 ndb/test/ndbapi/flexHammer
 ndb/test/ndbapi/flexTT
 ndb/test/ndbapi/testBackup
 ndb/test/ndbapi/testBasic
-ndb/test/ndbapi/testBasic.dsp
 ndb/test/ndbapi/testBasicAsynch
 ndb/test/ndbapi/testBlobs
-ndb/test/ndbapi/testBlobs.dsp
 ndb/test/ndbapi/testDataBuffers
 ndb/test/ndbapi/testDeadlock
 ndb/test/ndbapi/testDict
@@ -1753,7 +1063,6 @@ ndb/test/ndbapi/testOperations
 ndb/test/ndbapi/testRestartGci
 ndb/test/ndbapi/testSRBank
 ndb/test/ndbapi/testScan
-ndb/test/ndbapi/testScan.dsp
 ndb/test/ndbapi/testScanInterpreter
 ndb/test/ndbapi/testScanPerf
 ndb/test/ndbapi/testSystemRestart
@@ -1761,7 +1070,6 @@ ndb/test/ndbapi/testTimeout
 ndb/test/ndbapi/testTransactions
 ndb/test/ndbapi/test_event
 ndb/test/run-test/atrt
-ndb/test/src/libNDBT.dsp
 ndb/test/tools/copy_tab
 ndb/test/tools/create_index
 ndb/test/tools/hugoCalculator
@@ -1779,23 +1087,15 @@ ndb/test/tools/restart
 ndb/test/tools/verify_index
 ndb/tools/ndb_config
 ndb/tools/ndb_delete_all
-ndb/tools/ndb_delete_all.dsp
 ndb/tools/ndb_desc
-ndb/tools/ndb_desc.dsp
 ndb/tools/ndb_drop_index
-ndb/tools/ndb_drop_index.dsp
 ndb/tools/ndb_drop_table
-ndb/tools/ndb_drop_table.dsp
 ndb/tools/ndb_restore
 ndb/tools/ndb_select_all
-ndb/tools/ndb_select_all.dsp
 ndb/tools/ndb_select_count
-ndb/tools/ndb_select_count.dsp
 ndb/tools/ndb_show_tables
-ndb/tools/ndb_show_tables.dsp
 ndb/tools/ndb_test_platform
 ndb/tools/ndb_waiter
-ndb/tools/ndb_waiter.dsp
 ndbcluster-1186
 ndbcluster-1186/SCCS
 ndbcluster-1186/config.ini
@@ -1809,40 +1109,15 @@ ndbcluster-1186/ndb_3.pid
 ndbcluster-1186/ndb_3_cluster.log
 ndbcluster-1186/ndb_3_out.log
 ndbcluster-1186/ndbcluster.pid
-netware/.deps/libmysqlmain.Po
-netware/.deps/my_manage.Po
-netware/.deps/mysql_install_db.Po
-netware/.deps/mysql_test_run.Po
-netware/.deps/mysqld_safe.Po
 netware/init_db.sql
 netware/libmysql.imp
 netware/test_db.sql
 pack_isam/*.ds?
 perror/*.ds?
 perror/*.vcproj
-plugin/fulltext/.deps/mypluglib_la-plugin_example.Plo
-plugin/fulltext/.libs/mypluglib.lai
-plugin/fulltext/.libs/mypluglib.so.0
-plugin/fulltext/.libs/mypluglib.so.0.0.0
-pstack/.deps/bucomm.Po
-pstack/.deps/debug.Po
-pstack/.deps/filemode.Po
-pstack/.deps/ieee.Po
-pstack/.deps/linuxthreads.Po
-pstack/.deps/pstack.Po
-pstack/.deps/rddbg.Po
-pstack/.deps/stabs.Po
 pull.log
 regex/*.ds?
 regex/*.vcproj
-regex/.deps/debug.Po
-regex/.deps/main.Po
-regex/.deps/regcomp.Po
-regex/.deps/regerror.Po
-regex/.deps/regexec.Po
-regex/.deps/regfree.Po
-regex/.deps/reginit.Po
-regex/.deps/split.Po
 regex/re
 repl-tests/test-repl-ts/repl-timestamp.master.reject
 repl-tests/test-repl/foo-dump-slave.master.
@@ -1887,28 +1162,6 @@ scripts/mysqlhotcopy
 scripts/mysqlhotcopy.sh.rej
 scripts/safe_mysqld
 select_test
-server-tools/instance-manager/.deps/buffer.Po
-server-tools/instance-manager/.deps/command.Po
-server-tools/instance-manager/.deps/commands.Po
-server-tools/instance-manager/.deps/guardian.Po
-server-tools/instance-manager/.deps/instance.Po
-server-tools/instance-manager/.deps/instance_map.Po
-server-tools/instance-manager/.deps/instance_options.Po
-server-tools/instance-manager/.deps/liboptions_la-options.Plo
-server-tools/instance-manager/.deps/liboptions_la-priv.Plo
-server-tools/instance-manager/.deps/listener.Po
-server-tools/instance-manager/.deps/log.Po
-server-tools/instance-manager/.deps/manager.Po
-server-tools/instance-manager/.deps/messages.Po
-server-tools/instance-manager/.deps/mysql_connection.Po
-server-tools/instance-manager/.deps/mysqlmanager.Po
-server-tools/instance-manager/.deps/net_serv.Po
-server-tools/instance-manager/.deps/parse.Po
-server-tools/instance-manager/.deps/parse_output.Po
-server-tools/instance-manager/.deps/protocol.Po
-server-tools/instance-manager/.deps/thread_registry.Po
-server-tools/instance-manager/.deps/user_management_commands.Po
-server-tools/instance-manager/.deps/user_map.Po
 server-tools/instance-manager/buffer.cpp
 server-tools/instance-manager/client.c
 server-tools/instance-manager/client_settings.h
@@ -1966,140 +1219,10 @@ sql-bench/test-wisconsin
 sql/*.cpp
 sql/*.ds?
 sql/*.vcproj
-sql/.deps/client.Po
-sql/.deps/derror.Po
-sql/.deps/des_key_file.Po
-sql/.deps/discover.Po
-sql/.deps/event_data_objects.Po
-sql/.deps/event_db_repository.Po
-sql/.deps/event_queue.Po
-sql/.deps/event_scheduler.Po
-sql/.deps/events.Po
-sql/.deps/field.Po
-sql/.deps/field_conv.Po
-sql/.deps/filesort.Po
-sql/.deps/gen_lex_hash.Po
-sql/.deps/gstream.Po
-sql/.deps/ha_berkeley.Po
-sql/.deps/ha_federated.Po
-sql/.deps/ha_heap.Po
-sql/.deps/ha_innodb.Po
-sql/.deps/ha_myisam.Po
-sql/.deps/ha_myisammrg.Po
-sql/.deps/ha_ndbcluster.Po
-sql/.deps/ha_ndbcluster_binlog.Po
-sql/.deps/ha_partition.Po
-sql/.deps/handler.Po
-sql/.deps/hash_filo.Po
-sql/.deps/hostname.Po
-sql/.deps/init.Po
-sql/.deps/item.Po
-sql/.deps/item_buff.Po
-sql/.deps/item_cmpfunc.Po
-sql/.deps/item_create.Po
-sql/.deps/item_func.Po
-sql/.deps/item_geofunc.Po
-sql/.deps/item_row.Po
-sql/.deps/item_strfunc.Po
-sql/.deps/item_subselect.Po
-sql/.deps/item_sum.Po
-sql/.deps/item_timefunc.Po
-sql/.deps/item_uniq.Po
-sql/.deps/item_xmlfunc.Po
-sql/.deps/key.Po
-sql/.deps/lock.Po
-sql/.deps/log.Po
-sql/.deps/log_event.Po
-sql/.deps/mf_iocache.Po
-sql/.deps/mini_client_errors.Po
-sql/.deps/my_decimal.Po
-sql/.deps/my_lock.Po
-sql/.deps/my_time.Po
-sql/.deps/my_user.Po
-sql/.deps/mysql_tzinfo_to_sql.Po
-sql/.deps/mysqld.Po
-sql/.deps/net_serv.Po
-sql/.deps/opt_range.Po
-sql/.deps/opt_sum.Po
-sql/.deps/pack.Po
-sql/.deps/parse_file.Po
-sql/.deps/partition_info.Po
-sql/.deps/password.Po
-sql/.deps/procedure.Po
-sql/.deps/protocol.Po
-sql/.deps/records.Po
-sql/.deps/repl_failsafe.Po
-sql/.deps/rpl_filter.Po
-sql/.deps/rpl_injector.Po
-sql/.deps/rpl_tblmap.Po
-sql/.deps/set_var.Po
-sql/.deps/slave.Po
-sql/.deps/sp.Po
-sql/.deps/sp_cache.Po
-sql/.deps/sp_head.Po
-sql/.deps/sp_pcontext.Po
-sql/.deps/sp_rcontext.Po
-sql/.deps/spatial.Po
-sql/.deps/sql_acl.Po
-sql/.deps/sql_analyse.Po
-sql/.deps/sql_base.Po
-sql/.deps/sql_binlog.Po
-sql/.deps/sql_builtin.Po
-sql/.deps/sql_cache.Po
-sql/.deps/sql_class.Po
-sql/.deps/sql_client.Po
-sql/.deps/sql_crypt.Po
-sql/.deps/sql_cursor.Po
-sql/.deps/sql_db.Po
-sql/.deps/sql_delete.Po
-sql/.deps/sql_derived.Po
-sql/.deps/sql_do.Po
-sql/.deps/sql_error.Po
-sql/.deps/sql_handler.Po
-sql/.deps/sql_help.Po
-sql/.deps/sql_insert.Po
-sql/.deps/sql_lex.Po
-sql/.deps/sql_list.Po
-sql/.deps/sql_load.Po
-sql/.deps/sql_manager.Po
-sql/.deps/sql_map.Po
-sql/.deps/sql_olap.Po
-sql/.deps/sql_parse.Po
-sql/.deps/sql_partition.Po
-sql/.deps/sql_plugin.Po
-sql/.deps/sql_prepare.Po
-sql/.deps/sql_rename.Po
-sql/.deps/sql_repl.Po
-sql/.deps/sql_select.Po
-sql/.deps/sql_show.Po
-sql/.deps/sql_state.Po
-sql/.deps/sql_string.Po
-sql/.deps/sql_table.Po
-sql/.deps/sql_tablespace.Po
-sql/.deps/sql_test.Po
-sql/.deps/sql_trigger.Po
-sql/.deps/sql_udf.Po
-sql/.deps/sql_union.Po
-sql/.deps/sql_update.Po
-sql/.deps/sql_view.Po
-sql/.deps/sql_yacc.Po
-sql/.deps/stacktrace.Po
-sql/.deps/strfunc.Po
-sql/.deps/table.Po
-sql/.deps/thr_malloc.Po
-sql/.deps/time.Po
-sql/.deps/tztime.Po
-sql/.deps/udf_example.Plo
-sql/.deps/uniques.Po
-sql/.deps/unireg.Po
 sql/.gdbinit
-sql/.libs/udf_example.lai
-sql/.libs/udf_example.so.0
-sql/.libs/udf_example.so.0.0.0
 sql/client.c
 sql/f.c
 sql/gen_lex_hash
-sql/gmon.out
 sql/handlerton.cc
 sql/lex_hash.h
 sql/link_sources
@@ -2122,13 +1245,33 @@ sql/new.cc
 sql/pack.c
 sql/safe_to_cache_query.txt
 sql/share/*.sys
-sql/share/charsets/gmon.out
 sql/share/fixerrmsg.pl
-sql/share/gmon.out
 sql/share/iso639-2.txt
 sql/share/mysql
-sql/share/norwegian-ny/errmsg.sys
-sql/share/norwegian/errmsg.sys
+sql/share/czech/
+sql/share/danish/
+sql/share/dutch/
+sql/share/english/
+sql/share/estonian/
+sql/share/french/
+sql/share/german/
+sql/share/greek/
+sql/share/hungarian/
+sql/share/italian/
+sql/share/japanese/
+sql/share/japanese-sjis/
+sql/share/korean/
+sql/share/norwegian/
+sql/share/norwegian-ny/
+sql/share/polish/
+sql/share/portuguese/
+sql/share/romanian/
+sql/share/russian/
+sql/share/serbian/
+sql/share/slovak/
+sql/share/spanish/
+sql/share/swedish/
+sql/share/ukrainian/
 sql/sql_builtin.cc
 sql/sql_select.cc.orig
 sql/sql_yacc.cc
@@ -2148,12 +1291,6 @@ stamp-h2.in
 stamp-h3
 stamp-h4
 start_mysqld.sh
-storage/archive/.deps/archive_test-archive_test.Po
-storage/archive/.deps/archive_test-azio.Po
-storage/archive/.deps/ha_archive_la-azio.Plo
-storage/archive/.deps/ha_archive_la-ha_archive.Plo
-storage/archive/.deps/libarchive_a-azio.Po
-storage/archive/.deps/libarchive_a-ha_archive.Po
 storage/archive/archive_reader
 storage/archive/archive_test
 storage/bdb/*.ds?
@@ -2175,44 +1312,14 @@ storage/bdb/build_vxworks/db_int.h
 storage/bdb/build_vxworks/dbdemo/dbdemo.c
 storage/bdb/build_vxworks/dbdemo/dbdemo20.wpj
 storage/bdb/build_vxworks/dbdemo/dbdemo22.wpj
-storage/bdb/build_win32/*.dsp
 storage/bdb/build_win32/*.h
 storage/bdb/build_win32/db.h
-storage/bdb/build_win32/db_archive.dsp
-storage/bdb/build_win32/db_checkpoint.dsp
 storage/bdb/build_win32/db_config.h
 storage/bdb/build_win32/db_cxx.h
-storage/bdb/build_win32/db_deadlock.dsp
-storage/bdb/build_win32/db_dll.dsp
-storage/bdb/build_win32/db_dump.dsp
 storage/bdb/build_win32/db_int.h
-storage/bdb/build_win32/db_java.dsp
-storage/bdb/build_win32/db_load.dsp
-storage/bdb/build_win32/db_perf.dsp
-storage/bdb/build_win32/db_printlog.dsp
-storage/bdb/build_win32/db_recover.dsp
-storage/bdb/build_win32/db_stat.dsp
-storage/bdb/build_win32/db_static.dsp
-storage/bdb/build_win32/db_tcl.dsp
-storage/bdb/build_win32/db_test.dsp
-storage/bdb/build_win32/db_upgrade.dsp
-storage/bdb/build_win32/db_verify.dsp
-storage/bdb/build_win32/ex_access.dsp
-storage/bdb/build_win32/ex_btrec.dsp
-storage/bdb/build_win32/ex_env.dsp
-storage/bdb/build_win32/ex_lock.dsp
-storage/bdb/build_win32/ex_mpool.dsp
-storage/bdb/build_win32/ex_tpcb.dsp
-storage/bdb/build_win32/excxx_access.dsp
-storage/bdb/build_win32/excxx_btrec.dsp
-storage/bdb/build_win32/excxx_env.dsp
-storage/bdb/build_win32/excxx_lock.dsp
-storage/bdb/build_win32/excxx_mpool.dsp
-storage/bdb/build_win32/excxx_tpcb.dsp
 storage/bdb/build_win32/include.tcl
 storage/bdb/build_win32/libdb.def
 storage/bdb/build_win32/libdb.rc
-storage/bdb/build_win64/*.dsp
 storage/bdb/build_win64/*.dsw
 storage/bdb/build_win64/*.h
 storage/bdb/db/crdel_auto.c
@@ -2314,38 +1421,6 @@ storage/bdb/test/include.tcl
 storage/bdb/test/logtrack.list
 storage/bdb/txn/txn_auto.c
 storage/bdb/txn/txn_autop.c
-storage/blackhole/.deps/ha_blackhole_la-ha_blackhole.Plo
-storage/blackhole/.deps/libblackhole_a-ha_blackhole.Po
-storage/csv/.deps/ha_csv_la-ha_tina.Plo
-storage/csv/.deps/libcsv_a-ha_tina.Po
-storage/example/.deps/ha_example_la-ha_example.Plo
-storage/example/.deps/libexample_a-ha_example.Po
-storage/heap/.deps/_check.Po
-storage/heap/.deps/_rectest.Po
-storage/heap/.deps/hp_block.Po
-storage/heap/.deps/hp_clear.Po
-storage/heap/.deps/hp_close.Po
-storage/heap/.deps/hp_create.Po
-storage/heap/.deps/hp_delete.Po
-storage/heap/.deps/hp_extra.Po
-storage/heap/.deps/hp_hash.Po
-storage/heap/.deps/hp_info.Po
-storage/heap/.deps/hp_open.Po
-storage/heap/.deps/hp_panic.Po
-storage/heap/.deps/hp_rename.Po
-storage/heap/.deps/hp_rfirst.Po
-storage/heap/.deps/hp_rkey.Po
-storage/heap/.deps/hp_rlast.Po
-storage/heap/.deps/hp_rnext.Po
-storage/heap/.deps/hp_rprev.Po
-storage/heap/.deps/hp_rrnd.Po
-storage/heap/.deps/hp_rsame.Po
-storage/heap/.deps/hp_scan.Po
-storage/heap/.deps/hp_static.Po
-storage/heap/.deps/hp_test1.Po
-storage/heap/.deps/hp_test2.Po
-storage/heap/.deps/hp_update.Po
-storage/heap/.deps/hp_write.Po
 storage/heap/hp_test1
 storage/heap/hp_test2
 storage/innobase/autom4te-2.53.cache/*
@@ -2356,155 +1431,55 @@ storage/innobase/autom4te.cache/*
 storage/innobase/autom4te.cache/output.0
 storage/innobase/autom4te.cache/requests
 storage/innobase/autom4te.cache/traces.0
-storage/innobase/btr/.deps/btr0btr.Po
-storage/innobase/btr/.deps/btr0cur.Po
-storage/innobase/btr/.deps/btr0pcur.Po
-storage/innobase/btr/.deps/btr0sea.Po
-storage/innobase/buf/.deps/buf0buf.Po
-storage/innobase/buf/.deps/buf0flu.Po
-storage/innobase/buf/.deps/buf0lru.Po
-storage/innobase/buf/.deps/buf0rea.Po
 storage/innobase/configure.lineno
 storage/innobase/conftest.s1
 storage/innobase/conftest.subs
-storage/innobase/data/.deps/data0data.Po
-storage/innobase/data/.deps/data0type.Po
-storage/innobase/dict/.deps/dict0boot.Po
-storage/innobase/dict/.deps/dict0crea.Po
-storage/innobase/dict/.deps/dict0dict.Po
-storage/innobase/dict/.deps/dict0load.Po
-storage/innobase/dict/.deps/dict0mem.Po
-storage/innobase/dyn/.deps/dyn0dyn.Po
-storage/innobase/eval/.deps/eval0eval.Po
-storage/innobase/eval/.deps/eval0proc.Po
-storage/innobase/fil/.deps/fil0fil.Po
-storage/innobase/fsp/.deps/fsp0fsp.Po
-storage/innobase/fut/.deps/fut0fut.Po
-storage/innobase/fut/.deps/fut0lst.Po
-storage/innobase/ha/.deps/ha0ha.Po
-storage/innobase/ha/.deps/hash0hash.Po
 storage/innobase/ib_config.h
 storage/innobase/ib_config.h.in
-storage/innobase/ibuf/.deps/ibuf0ibuf.Po
-storage/innobase/lock/.deps/lock0lock.Po
-storage/innobase/log/.deps/log0log.Po
-storage/innobase/log/.deps/log0recv.Po
-storage/innobase/mach/.deps/mach0data.Po
-storage/innobase/mem/.deps/mem0mem.Po
-storage/innobase/mem/.deps/mem0pool.Po
 storage/innobase/mkinstalldirs
-storage/innobase/mtr/.deps/mtr0log.Po
-storage/innobase/mtr/.deps/mtr0mtr.Po
-storage/innobase/os/.deps/os0file.Po
-storage/innobase/os/.deps/os0proc.Po
-storage/innobase/os/.deps/os0sync.Po
-storage/innobase/os/.deps/os0thread.Po
-storage/innobase/page/.deps/page0cur.Po
-storage/innobase/page/.deps/page0page.Po
-storage/innobase/pars/.deps/lexyy.Po
-storage/innobase/pars/.deps/pars0grm.Po
-storage/innobase/pars/.deps/pars0opt.Po
-storage/innobase/pars/.deps/pars0pars.Po
-storage/innobase/pars/.deps/pars0sym.Po
-storage/innobase/que/.deps/que0que.Po
-storage/innobase/read/.deps/read0read.Po
-storage/innobase/rem/.deps/rem0cmp.Po
-storage/innobase/rem/.deps/rem0rec.Po
-storage/innobase/row/.deps/row0ins.Po
-storage/innobase/row/.deps/row0mysql.Po
-storage/innobase/row/.deps/row0purge.Po
-storage/innobase/row/.deps/row0row.Po
-storage/innobase/row/.deps/row0sel.Po
-storage/innobase/row/.deps/row0uins.Po
-storage/innobase/row/.deps/row0umod.Po
-storage/innobase/row/.deps/row0undo.Po
-storage/innobase/row/.deps/row0upd.Po
-storage/innobase/row/.deps/row0vers.Po
-storage/innobase/srv/.deps/srv0que.Po
-storage/innobase/srv/.deps/srv0srv.Po
-storage/innobase/srv/.deps/srv0start.Po
 storage/innobase/stamp-h1
-storage/innobase/sync/.deps/sync0arr.Po
-storage/innobase/sync/.deps/sync0rw.Po
-storage/innobase/sync/.deps/sync0sync.Po
-storage/innobase/thr/.deps/thr0loc.Po
-storage/innobase/trx/.deps/trx0purge.Po
-storage/innobase/trx/.deps/trx0rec.Po
-storage/innobase/trx/.deps/trx0roll.Po
-storage/innobase/trx/.deps/trx0rseg.Po
-storage/innobase/trx/.deps/trx0sys.Po
-storage/innobase/trx/.deps/trx0trx.Po
-storage/innobase/trx/.deps/trx0undo.Po
-storage/innobase/usr/.deps/usr0sess.Po
-storage/innobase/ut/.deps/ut0byte.Po
-storage/innobase/ut/.deps/ut0dbg.Po
-storage/innobase/ut/.deps/ut0list.Po
-storage/innobase/ut/.deps/ut0mem.Po
-storage/innobase/ut/.deps/ut0rnd.Po
-storage/innobase/ut/.deps/ut0ut.Po
-storage/innobase/ut/.deps/ut0vec.Po
-storage/innobase/ut/.deps/ut0wqueue.Po
-storage/myisam/.deps/ft_boolean_search.Po
-storage/myisam/.deps/ft_nlq_search.Po
-storage/myisam/.deps/ft_parser.Po
-storage/myisam/.deps/ft_static.Po
-storage/myisam/.deps/ft_stopwords.Po
-storage/myisam/.deps/ft_update.Po
-storage/myisam/.deps/mi_cache.Po
-storage/myisam/.deps/mi_changed.Po
-storage/myisam/.deps/mi_check.Po
-storage/myisam/.deps/mi_checksum.Po
-storage/myisam/.deps/mi_close.Po
-storage/myisam/.deps/mi_create.Po
-storage/myisam/.deps/mi_dbug.Po
-storage/myisam/.deps/mi_delete.Po
-storage/myisam/.deps/mi_delete_all.Po
-storage/myisam/.deps/mi_delete_table.Po
-storage/myisam/.deps/mi_dynrec.Po
-storage/myisam/.deps/mi_extra.Po
-storage/myisam/.deps/mi_info.Po
-storage/myisam/.deps/mi_key.Po
-storage/myisam/.deps/mi_keycache.Po
-storage/myisam/.deps/mi_locking.Po
-storage/myisam/.deps/mi_log.Po
-storage/myisam/.deps/mi_open.Po
-storage/myisam/.deps/mi_packrec.Po
-storage/myisam/.deps/mi_page.Po
-storage/myisam/.deps/mi_panic.Po
-storage/myisam/.deps/mi_preload.Po
-storage/myisam/.deps/mi_range.Po
-storage/myisam/.deps/mi_rename.Po
-storage/myisam/.deps/mi_rfirst.Po
-storage/myisam/.deps/mi_rkey.Po
-storage/myisam/.deps/mi_rlast.Po
-storage/myisam/.deps/mi_rnext.Po
-storage/myisam/.deps/mi_rnext_same.Po
-storage/myisam/.deps/mi_rprev.Po
-storage/myisam/.deps/mi_rrnd.Po
-storage/myisam/.deps/mi_rsame.Po
-storage/myisam/.deps/mi_rsamepos.Po
-storage/myisam/.deps/mi_scan.Po
-storage/myisam/.deps/mi_search.Po
-storage/myisam/.deps/mi_static.Po
-storage/myisam/.deps/mi_statrec.Po
-storage/myisam/.deps/mi_test1.Po
-storage/myisam/.deps/mi_test2.Po
-storage/myisam/.deps/mi_test3.Po
-storage/myisam/.deps/mi_unique.Po
-storage/myisam/.deps/mi_update.Po
-storage/myisam/.deps/mi_write.Po
-storage/myisam/.deps/myisam_ftdump.Po
-storage/myisam/.deps/myisamchk.Po
-storage/myisam/.deps/myisamlog.Po
-storage/myisam/.deps/myisampack.Po
-storage/myisam/.deps/rt_index.Po
-storage/myisam/.deps/rt_key.Po
-storage/myisam/.deps/rt_mbr.Po
-storage/myisam/.deps/rt_split.Po
-storage/myisam/.deps/rt_test.Po
-storage/myisam/.deps/sort.Po
-storage/myisam/.deps/sp_key.Po
-storage/myisam/.deps/sp_test.Po
+storage/maria/*.MAD
+storage/maria/*.MAI
+storage/maria/ma_rt_test
+storage/maria/ma_sp_test
+storage/maria/ma_test1
+storage/maria/ma_test2
+storage/maria/ma_test3
+storage/maria/ma_test_all
+storage/maria/maria.log
+storage/maria/maria_chk
+storage/maria/maria_control
+storage/maria/maria_dump_log
+storage/maria/maria_ftdump
+storage/maria/maria_log
+storage/maria/maria_log.*
+storage/maria/maria_pack
+storage/maria/maria_read_log
+storage/maria/tmp
+storage/maria/tmp/*
+storage/maria/unittest/ma_pagecache_consist_1k-t-big
+storage/maria/unittest/ma_pagecache_consist_1kHC-t-big
+storage/maria/unittest/ma_pagecache_consist_1kRD-t-big
+storage/maria/unittest/ma_pagecache_consist_1kWR-t-big
+storage/maria/unittest/ma_pagecache_consist_64k-t-big
+storage/maria/unittest/ma_pagecache_consist_64kHC-t-big
+storage/maria/unittest/ma_pagecache_consist_64kRD-t-big
+storage/maria/unittest/ma_pagecache_consist_64kWR-t-big
+storage/maria/unittest/ma_pagecache_single_64k-t-big
+storage/maria/unittest/ma_test_loghandler_long-t-big
+storage/maria/unittest/maria_control
+storage/maria/unittest/mf_pagecache_consist_1k-t-big
+storage/maria/unittest/mf_pagecache_consist_1kHC-t-big
+storage/maria/unittest/mf_pagecache_consist_1kRD-t-big
+storage/maria/unittest/mf_pagecache_consist_1kWR-t-big
+storage/maria/unittest/mf_pagecache_consist_64k-t-big
+storage/maria/unittest/mf_pagecache_consist_64kHC-t-big
+storage/maria/unittest/mf_pagecache_consist_64kRD-t-big
+storage/maria/unittest/mf_pagecache_consist_64kWR-t-big
+storage/maria/unittest/mf_pagecache_single_64k-t-big
+storage/maria/unittest/page_cache_test_file_1
+storage/maria/unittest/pagecache_debug.log
+storage/maria/unittest/tmp/*
 storage/myisam/FT1.MYD
 storage/myisam/FT1.MYI
 storage/myisam/ft_dump
@@ -2530,27 +1505,6 @@ storage/myisam/test1.MYD
 storage/myisam/test1.MYI
 storage/myisam/test2.MYD
 storage/myisam/test2.MYI
-storage/myisammrg/.deps/myrg_close.Po
-storage/myisammrg/.deps/myrg_create.Po
-storage/myisammrg/.deps/myrg_delete.Po
-storage/myisammrg/.deps/myrg_extra.Po
-storage/myisammrg/.deps/myrg_info.Po
-storage/myisammrg/.deps/myrg_locking.Po
-storage/myisammrg/.deps/myrg_open.Po
-storage/myisammrg/.deps/myrg_panic.Po
-storage/myisammrg/.deps/myrg_queue.Po
-storage/myisammrg/.deps/myrg_range.Po
-storage/myisammrg/.deps/myrg_rfirst.Po
-storage/myisammrg/.deps/myrg_rkey.Po
-storage/myisammrg/.deps/myrg_rlast.Po
-storage/myisammrg/.deps/myrg_rnext.Po
-storage/myisammrg/.deps/myrg_rnext_same.Po
-storage/myisammrg/.deps/myrg_rprev.Po
-storage/myisammrg/.deps/myrg_rrnd.Po
-storage/myisammrg/.deps/myrg_rsame.Po
-storage/myisammrg/.deps/myrg_static.Po
-storage/myisammrg/.deps/myrg_update.Po
-storage/myisammrg/.deps/myrg_write.Po
 storage/ndb/bin/DbAsyncGenerator
 storage/ndb/bin/DbCreate
 storage/ndb/bin/acid
@@ -2686,53 +1640,21 @@ storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan
 storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple
 storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual
 storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index
-storage/ndb/src/common/debugger/libtrace.dsp
-storage/ndb/src/common/debugger/signaldata/libsignaldataprint.dsp
-storage/ndb/src/common/logger/liblogger.dsp
-storage/ndb/src/common/mgmcommon/libmgmsrvcommon.dsp
 storage/ndb/src/common/mgmcommon/printConfig/*.d
-storage/ndb/src/common/portlib/libportlib.dsp
-storage/ndb/src/common/transporter/libtransporter.dsp
-storage/ndb/src/common/util/libgeneral.dsp
 storage/ndb/src/common/util/testBitmask.cpp
 storage/ndb/src/cw/cpcd/ndb_cpcd
 storage/ndb/src/dummy.cpp
-storage/ndb/src/kernel/blocks/backup/libbackup.dsp
 storage/ndb/src/kernel/blocks/backup/ndb_print_backup_file
 storage/ndb/src/kernel/blocks/backup/restore/ndb_restore
-storage/ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
-storage/ndb/src/kernel/blocks/dbacc/libdbacc.dsp
-storage/ndb/src/kernel/blocks/dbdict/libdbdict.dsp
 storage/ndb/src/kernel/blocks/dbdict/ndb_print_schema_file
-storage/ndb/src/kernel/blocks/dbdih/libdbdih.dsp
 storage/ndb/src/kernel/blocks/dbdih/ndb_print_sys_file
-storage/ndb/src/kernel/blocks/dblqh/libdblqh.dsp
-storage/ndb/src/kernel/blocks/dbtc/libdbtc.dsp
-storage/ndb/src/kernel/blocks/dbtup/libdbtup.dsp
 storage/ndb/src/kernel/blocks/dbtup/test_varpage
-storage/ndb/src/kernel/blocks/dbtux/libdbtux.dsp
-storage/ndb/src/kernel/blocks/dbutil/libdbutil.dsp
-storage/ndb/src/kernel/blocks/grep/libgrep.dsp
 storage/ndb/src/kernel/blocks/ndb_print_file
-storage/ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp
-storage/ndb/src/kernel/blocks/ndbfs/libndbfs.dsp
-storage/ndb/src/kernel/blocks/qmgr/libqmgr.dsp
-storage/ndb/src/kernel/blocks/suma/libsuma.dsp
-storage/ndb/src/kernel/blocks/trix/libtrix.dsp
-storage/ndb/src/kernel/error/liberror.dsp
 storage/ndb/src/kernel/ndbd
-storage/ndb/src/kernel/ndbd.dsp
-storage/ndb/src/kernel/vm/libkernel.dsp
 storage/ndb/src/libndb.ver
-storage/ndb/src/libndbclient.dsp
-storage/ndb/src/mgmapi/libmgmapi.dsp
-storage/ndb/src/mgmclient/libndbmgmclient.dsp
 storage/ndb/src/mgmclient/ndb_mgm
-storage/ndb/src/mgmclient/ndb_mgm.dsp
 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
@@ -2748,17 +1670,14 @@ storage/ndb/test/ndbapi/create_tab
 storage/ndb/test/ndbapi/drop_all_tabs
 storage/ndb/test/ndbapi/flexAsynch
 storage/ndb/test/ndbapi/flexBench
-storage/ndb/test/ndbapi/flexBench.dsp
 storage/ndb/test/ndbapi/flexHammer
 storage/ndb/test/ndbapi/flexTT
 storage/ndb/test/ndbapi/ndbapi_slow_select
 storage/ndb/test/ndbapi/testBackup
 storage/ndb/test/ndbapi/testBasic
-storage/ndb/test/ndbapi/testBasic.dsp
 storage/ndb/test/ndbapi/testBasicAsynch
 storage/ndb/test/ndbapi/testBitfield
 storage/ndb/test/ndbapi/testBlobs
-storage/ndb/test/ndbapi/testBlobs.dsp
 storage/ndb/test/ndbapi/testDataBuffers
 storage/ndb/test/ndbapi/testDeadlock
 storage/ndb/test/ndbapi/testDict
@@ -2776,7 +1695,6 @@ storage/ndb/test/ndbapi/testReadPerf
 storage/ndb/test/ndbapi/testRestartGci
 storage/ndb/test/ndbapi/testSRBank
 storage/ndb/test/ndbapi/testScan
-storage/ndb/test/ndbapi/testScan.dsp
 storage/ndb/test/ndbapi/testScanInterpreter
 storage/ndb/test/ndbapi/testScanPerf
 storage/ndb/test/ndbapi/testSystemRestart
@@ -2785,7 +1703,6 @@ storage/ndb/test/ndbapi/testTransactions
 storage/ndb/test/ndbapi/test_event
 storage/ndb/test/ndbapi/test_event_merge
 storage/ndb/test/run-test/atrt
-storage/ndb/test/src/libNDBT.dsp
 storage/ndb/test/tools/copy_tab
 storage/ndb/test/tools/create_index
 storage/ndb/test/tools/hugoCalculator
@@ -2805,83 +1722,17 @@ storage/ndb/test/tools/restart
 storage/ndb/test/tools/verify_index
 storage/ndb/tools/ndb_config
 storage/ndb/tools/ndb_delete_all
-storage/ndb/tools/ndb_delete_all.dsp
 storage/ndb/tools/ndb_desc
-storage/ndb/tools/ndb_desc.dsp
 storage/ndb/tools/ndb_drop_index
-storage/ndb/tools/ndb_drop_index.dsp
 storage/ndb/tools/ndb_drop_table
-storage/ndb/tools/ndb_drop_table.dsp
 storage/ndb/tools/ndb_restore
 storage/ndb/tools/ndb_select_all
-storage/ndb/tools/ndb_select_all.dsp
 storage/ndb/tools/ndb_select_count
-storage/ndb/tools/ndb_select_count.dsp
 storage/ndb/tools/ndb_show_tables
-storage/ndb/tools/ndb_show_tables.dsp
 storage/ndb/tools/ndb_test_platform
 storage/ndb/tools/ndb_waiter
-storage/ndb/tools/ndb_waiter.dsp
 strings/*.ds?
 strings/*.vcproj
-strings/.deps/bchange.Po
-strings/.deps/bcmp.Po
-strings/.deps/bfill.Po
-strings/.deps/bmove.Po
-strings/.deps/bmove512.Po
-strings/.deps/bmove_upp.Po
-strings/.deps/conf_to_src.Po
-strings/.deps/ctype-big5.Po
-strings/.deps/ctype-bin.Po
-strings/.deps/ctype-cp932.Po
-strings/.deps/ctype-czech.Po
-strings/.deps/ctype-euc_kr.Po
-strings/.deps/ctype-eucjpms.Po
-strings/.deps/ctype-extra.Po
-strings/.deps/ctype-gb2312.Po
-strings/.deps/ctype-gbk.Po
-strings/.deps/ctype-latin1.Po
-strings/.deps/ctype-mb.Po
-strings/.deps/ctype-simple.Po
-strings/.deps/ctype-sjis.Po
-strings/.deps/ctype-tis620.Po
-strings/.deps/ctype-uca.Po
-strings/.deps/ctype-ucs2.Po
-strings/.deps/ctype-ujis.Po
-strings/.deps/ctype-utf8.Po
-strings/.deps/ctype-win1250ch.Po
-strings/.deps/ctype.Po
-strings/.deps/decimal.Po
-strings/.deps/int2str.Po
-strings/.deps/is_prefix.Po
-strings/.deps/llstr.Po
-strings/.deps/longlong2str.Po
-strings/.deps/longlong2str_asm.Po
-strings/.deps/my_strchr.Po
-strings/.deps/my_strtoll10.Po
-strings/.deps/my_vsnprintf.Po
-strings/.deps/r_strinstr.Po
-strings/.deps/str2int.Po
-strings/.deps/str_alloc.Po
-strings/.deps/strappend.Po
-strings/.deps/strcend.Po
-strings/.deps/strcont.Po
-strings/.deps/strend.Po
-strings/.deps/strfill.Po
-strings/.deps/strinstr.Po
-strings/.deps/strmake.Po
-strings/.deps/strmov.Po
-strings/.deps/strnlen.Po
-strings/.deps/strnmov.Po
-strings/.deps/strstr.Po
-strings/.deps/strtod.Po
-strings/.deps/strtol.Po
-strings/.deps/strtoll.Po
-strings/.deps/strtoul.Po
-strings/.deps/strtoull.Po
-strings/.deps/strxmov.Po
-strings/.deps/strxnmov.Po
-strings/.deps/xml.Po
 strings/conf_to_src
 strings/ctype_autoconf.c
 strings/ctype_extra_sources.c
@@ -2965,17 +1816,11 @@ test/tools/ndb_cpcc
 test/tools/restart
 test/tools/verify_index
 test1/*
+test?.MA?
 test_xml
 tests/*.ds?
 tests/*.vcproj
-tests/.deps/dummy.Po
-tests/.deps/insert_test.Po
-tests/.deps/mysql_client_test.Po
-tests/.deps/select_test.Po
-tests/.deps/thread_test.Po
 tests/.libs -prune
-tests/.libs/lt-mysql_client_test
-tests/.libs/mysql_client_test
 tests/bug25714
 tests/client_test
 tests/connect_test
@@ -2991,30 +1836,25 @@ tools/mysqlmngd
 tools/mysqltestmanager
 tools/mysys_priv.h
 unittest/examples/*.t
-unittest/examples/.deps/no_plan-t.Po
-unittest/examples/.deps/simple-t.Po
-unittest/examples/.deps/skip-t.Po
-unittest/examples/.deps/skip_all-t.Po
-unittest/examples/.deps/todo-t.Po
+unittest/maria_control
 unittest/mysys/*.t
-unittest/mysys/.deps/base64-t.Po
-unittest/mysys/.deps/bitmap-t.Po
-unittest/mysys/.deps/my_atomic-t.Po
-unittest/mytap/.deps/tap.Po
+unittest/mysys/mf_pagecache_consist_1k-t-big
+unittest/mysys/mf_pagecache_consist_1kHC-t-big
+unittest/mysys/mf_pagecache_consist_1kRD-t-big
+unittest/mysys/mf_pagecache_consist_1kWR-t-big
+unittest/mysys/mf_pagecache_consist_64k-t-big
+unittest/mysys/mf_pagecache_consist_64kHC-t-big
+unittest/mysys/mf_pagecache_consist_64kRD-t-big
+unittest/mysys/mf_pagecache_consist_64kWR-t-big
+unittest/mysys/mf_pagecache_single_64k-t-big
 unittest/mytap/t/*.t
-unittest/mytap/t/.deps/basic-t.Po
+unittest/page_cache_test_file_1
+unittest/pagecache_debug.log
+unittest/tmp/*
 unittest/unit
 vi.h
 vio/*.ds?
 vio/*.vcproj
-vio/.deps/dummy.Po
-vio/.deps/test-ssl.Po
-vio/.deps/test-sslclient.Po
-vio/.deps/test-sslserver.Po
-vio/.deps/vio.Po
-vio/.deps/viosocket.Po
-vio/.deps/viossl.Po
-vio/.deps/viosslfactories.Po
 vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver