diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-18 17:00:43 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-18 17:00:43 +0200 |
| commit | 406233b6f4cdc8fd6b62b54a66a131391cb55b66 (patch) | |
| tree | ceba48b8ceba1bef7ebd9ad813a0734488dd4c2c /.bzrignore | |
| parent | 4e6e8a399dfb583448ffa4fc6342973b03c4d83b (diff) | |
| parent | 5a144fcd378ae4cd05d18e4e9fef780fe925a881 (diff) | |
| download | mariadb-git-406233b6f4cdc8fd6b62b54a66a131391cb55b66.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-new-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
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 |