1 files changed, 33 insertions, 15 deletions
diff --git a/.bzrignore b/.bzrignore
index e794d7d51cc..0ed7e966dcc 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -45,6 +45,19 @@ COPYING
 COPYING.LIB
 Docs/#manual.texi#
 Docs/INSTALL-BINARY
+Docs/Images/myaccess-odbc.txt
+Docs/Images/myaccess.txt
+Docs/Images/myarchitecture.txt
+Docs/Images/mydll-properties.txt
+Docs/Images/mydsn-example.txt
+Docs/Images/mydsn-icon.txt
+Docs/Images/mydsn-options.txt
+Docs/Images/mydsn-setup.txt
+Docs/Images/mydsn-test-fail.txt
+Docs/Images/mydsn-test-success.txt
+Docs/Images/mydsn-trace.txt
+Docs/Images/mydsn.txt
+Docs/Images/myflowchart.txt
 Docs/include.texi
 Docs/internals.html
 Docs/internals.info
@@ -283,6 +296,7 @@ extra/resolveip
 extra/tztime.cc
 fcns.c
 fcns.h
+gdbinit
 gmon.out
 hardcopy.0
 heap/hp_test1
@@ -338,6 +352,7 @@ libmysqld/derror.cc
 libmysqld/discover.cc
 libmysqld/errmsg.c
 libmysqld/examples/client_test.c
+libmysqld/examples/client_test.cc
 libmysqld/examples/completion_hash.cc
 libmysqld/examples/completion_hash.h
 libmysqld/examples/link_sources
@@ -394,14 +409,21 @@ libmysqld/opt_ft.cc
 libmysqld/opt_range.cc
 libmysqld/opt_sum.cc
 libmysqld/pack.c
+libmysqld/parse_file.cc
 libmysqld/password.c
 libmysqld/procedure.cc
 libmysqld/protocol.cc
+libmysqld/protocol_cursor.cc
 libmysqld/records.cc
 libmysqld/repl_failsafe.cc
 libmysqld/set_var.cc
 libmysqld/simple-test
 libmysqld/slave.cc
+libmysqld/sp.cc
+libmysqld/sp_cache.cc
+libmysqld/sp_head.cc
+libmysqld/sp_pcontext.cc
+libmysqld/sp_rcontext.cc
 libmysqld/spatial.cc
 libmysqld/sql_acl.cc
 libmysqld/sql_analyse.cc
@@ -432,10 +454,12 @@ libmysqld/sql_state.c
 libmysqld/sql_string.cc
 libmysqld/sql_table.cc
 libmysqld/sql_test.cc
+libmysqld/sql_trigger.cc
 libmysqld/sql_udf.cc
 libmysqld/sql_union.cc
 libmysqld/sql_unions.cc
 libmysqld/sql_update.cc
+libmysqld/sql_view.cc
 libmysqld/sql_yacc.cc
 libmysqld/stacktrace.c
 libmysqld/strfunc.cc
@@ -496,8 +520,10 @@ mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
 mysql-test/gmon.out
 mysql-test/install_test_db
 mysql-test/mysql-test-run
+mysql-test/mysql_test_run_new
 mysql-test/ndb/ndbcluster
 mysql-test/r/*.reject
+mysql-test/r/index_merge_load.result
 mysql-test/r/rpl000001.eval
 mysql-test/r/rpl000002.eval
 mysql-test/r/rpl000014.eval
@@ -508,9 +534,11 @@ mysql-test/r/slave-running.eval
 mysql-test/r/slave-stopped.eval
 mysql-test/share/mysql
 mysql-test/std_data/*.pem
+mysql-test/t/index_merge.load
 mysql-test/var/*
 mysql.kdevprj
 mysql.proj
+mysql_priv.h
 mysqld.S
 mysqld.sym
 mysys/#mf_iocache.c#
@@ -714,6 +742,7 @@ ndb/tools/ndb_drop_table
 ndb/tools/ndb_select_all
 ndb/tools/ndb_select_count
 ndb/tools/ndb_show_tables
+ndb/tools/ndb_test_platform
 ndb/tools/ndb_waiter
 pull.log
 regex/re
@@ -751,6 +780,7 @@ scripts/mysqldumpslow
 scripts/mysqlhotcopy
 scripts/safe_mysqld
 select_test
+server-tools/instance-manager/mysqlmanager
 sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686
 sql-bench/bench-count-distinct
 sql-bench/bench-init.pl
@@ -815,7 +845,9 @@ sql_prepare.cc
 stamp-h
 stamp-h.in
 stamp-h1
+stamp-h1.in
 stamp-h2
+stamp-h2.in
 stamp-h3
 stamp-h4
 start_mysqld.sh
@@ -823,6 +855,7 @@ strings/conf_to_src
 strings/ctype_autoconf.c
 strings/ctype_extra_sources.c
 strings/str_test
+strings/test_decimal
 support-files/MacOSX/Description.plist
 support-files/MacOSX/Info.plist
 support-files/MacOSX/ReadMe.txt
@@ -909,18 +942,3 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-Docs/Images/myaccess-odbc.txt
-Docs/Images/myaccess.txt
-Docs/Images/myarchitecture.txt
-Docs/Images/mydll-properties.txt
-Docs/Images/mydsn-example.txt
-Docs/Images/mydsn-icon.txt
-Docs/Images/mydsn-options.txt
-Docs/Images/mydsn-setup.txt
-Docs/Images/mydsn-test-fail.txt
-Docs/Images/mydsn-test-success.txt
-Docs/Images/mydsn-trace.txt
-Docs/Images/mydsn.txt
-Docs/Images/myflowchart.txt
-mysql-test/mysql_test_run_new
-ndb/tools/ndb_test_platform