summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.blaudden>2007-04-18 14:18:55 +0200
committerunknown <msvensson@pilot.blaudden>2007-04-18 14:18:55 +0200
commit6bfa5a40bc8619d535ac656c36d4ebc5fd18093b (patch)
tree0f985ddfffc9a795634474887ee05e3d46ec88c9 /.bzrignore
parent8a4f717dfe87219281be020cc8d5f11f16d9e8f4 (diff)
parent5eab19d7a329af61c6c218bf192a85881b51088d (diff)
downloadmariadb-git-6bfa5a40bc8619d535ac656c36d4ebc5fd18093b.tar.gz
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint BitKeeper/etc/ignore: auto-union scripts/Makefile.am: Auto merged sql/mysql_priv.h: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~1: Auto merged client/mysql_upgrade.c: Use remote mysql-test/r/mysql_upgrade.result: Use remote Makefile.am: Merge "build scripts/ a little earlier" include/my_global.h: Merge
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 4127fd23c01..c3ab4dd33d8 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1805,6 +1805,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
@@ -1822,6 +1823,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