summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authormsvensson@pilot.blaudden <>2007-04-18 13:22:32 +0200
committermsvensson@pilot.blaudden <>2007-04-18 13:22:32 +0200
commitdd0d2146c328d2bbdc8600bf64355010c5aec2aa (patch)
tree3528bf5516292baeb59d3009dd2e876e94eceb91 /.bzrignore
parent8fdf9c5f64b7020458ea0be8090e4b572804c4a3 (diff)
parent20e622dcf3d287cb8934ab7ad1d9a0cc90f88a45 (diff)
downloadmariadb-git-dd0d2146c328d2bbdc8600bf64355010c5aec2aa.tar.gz
Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index c75109c401c..33552f5035c 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1085,6 +1085,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
@@ -1102,6 +1103,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