diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-18 13:22:32 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-18 13:22:32 +0200 |
| commit | 1b6c2b4c8d1a921f3efbd91eaca729804793cd66 (patch) | |
| tree | 3528bf5516292baeb59d3009dd2e876e94eceb91 /.bzrignore | |
| parent | 5fbd36e7ab6ae2a849f699cba9cfc91178c90c2b (diff) | |
| parent | cc43503322f8a4f81c1ddf63a27258554d5a3a32 (diff) | |
| download | mariadb-git-1b6c2b4c8d1a921f3efbd91eaca729804793cd66.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/ignore:
auto-union
CMakeLists.txt:
Auto merged
Makefile.am:
Auto merged
include/my_global.h:
Auto merged
sql/mysql_priv.h:
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 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 |