summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2001-12-21 13:38:06 +0000
committerunknown <serg@serg.mysql.com>2001-12-21 13:38:06 +0000
commit54108b2fcef9f25c75a2b2cfd93e7b7355971ce1 (patch)
tree63735ff406ff689f8b26f451a48d7b2080f7ab7f /.bzrignore
parent5478a2adb7949716a04461875dc7bd4005705ee8 (diff)
parentad24c890aca8a505f384225507b0561c60b2401b (diff)
downloadmariadb-git-54108b2fcef9f25c75a2b2cfd93e7b7355971ce1.tar.gz
Merge
BitKeeper/etc/ignore: auto-union sql/sql_handler.cc: Auto merged Docs/manual.texi: SCCS merged
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore5
1 files changed, 3 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore
index 299d079ef93..b3c77022ecc 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -287,6 +287,7 @@ libmysqld/sql_command
libmysqld/sql_crypt.cc
libmysqld/sql_db.cc
libmysqld/sql_delete.cc
+libmysqld/sql_do.cc
libmysqld/sql_handler.cc
libmysqld/sql_insert.cc
libmysqld/sql_lex.cc
@@ -367,6 +368,7 @@ scripts/mysql_config
scripts/mysql_convert_table_format
scripts/mysql_explain_log
scripts/mysql_find_rows
+scripts/mysql_fix_extensions
scripts/mysql_fix_privilege_tables
scripts/mysql_install_db
scripts/mysql_setpermission
@@ -398,6 +400,7 @@ sql-bench/test-connect
sql-bench/test-create
sql-bench/test-insert
sql-bench/test-select
+sql-bench/test-transactions
sql-bench/test-wisconsin
sql/.gdbinit
sql/gen_lex_hash
@@ -445,5 +448,3 @@ vio/test-ssl
vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
-sql-bench/test-transactions
-libmysqld/sql_do.cc