summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authormsvensson@pilot.blaudden <>2007-04-18 17:00:43 +0200
committermsvensson@pilot.blaudden <>2007-04-18 17:00:43 +0200
commitf6240e374dbf8e6d81abda04fefb550c1bbcc24f (patch)
treeceba48b8ceba1bef7ebd9ad813a0734488dd4c2c /.bzrignore
parentc9419c608ee9205eb567d6567b695a7e972a688a (diff)
parentdc66c88bbae1dd62d2f59fa8534fbcef04fe4f86 (diff)
downloadmariadb-git-f6240e374dbf8e6d81abda04fefb550c1bbcc24f.tar.gz
Merge bk-internal:/home/bk/mysql-5.1-new-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index efa1a272b39..c23ed5c700a 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1810,6 +1810,7 @@ repl-tests/test-repl/sum-wlen-slave.master.re
repl-tests/test-repl/sum-wlen-slave.master.reje
replace/*.ds?
replace/*.vcproj
+scripts/comp_sql
scripts/fill_func_tables
scripts/fill_func_tables.sql
scripts/fill_help_tables
@@ -1827,6 +1828,7 @@ scripts/mysql_find_rows
scripts/mysql_fix_extensions
scripts/mysql_fix_privilege_tables
scripts/mysql_fix_privilege_tables.sql
+scripts/mysql_fix_privilege_tables_sql.c
scripts/mysql_install_db
scripts/mysql_secure_installation
scripts/mysql_setpermission