diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-02-28 15:04:20 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-02-28 15:04:20 +0100 |
| commit | d8fb19e16987002038e4e9ebc53e5df21e6eadd1 (patch) | |
| tree | 90b2e6750e964a28430e908d071a50ecbbc29f91 /.bzrignore | |
| parent | 838e89dea60b7215a39c80824764d92f951dd5c4 (diff) | |
| parent | 22cac737ca87dc9f2e58069f21066c88d57a3e2c (diff) | |
| download | mariadb-git-d8fb19e16987002038e4e9ebc53e5df21e6eadd1.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-init_db.sql:
Auto merged
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index 0e0546e68c3..8e65ec6d6b8 100644 --- a/.bzrignore +++ b/.bzrignore @@ -696,6 +696,7 @@ mysql-test/*.ds? mysql-test/*.vcproj mysql-test/gmon.out mysql-test/install_test_db +mysql-test/lib/init_db.sql mysql-test/mtr mysql-test/mysql-test-run mysql-test/mysql-test-run-shell @@ -1098,6 +1099,7 @@ scripts/mysql_explain_log scripts/mysql_find_rows scripts/mysql_fix_extensions scripts/mysql_fix_privilege_tables +scripts/mysql_fix_privilege_tables.sql scripts/mysql_install_db scripts/mysql_secure_installation scripts/mysql_setpermission @@ -1335,4 +1337,3 @@ win/vs71cache.txt win/vs8cache.txt zlib/*.ds? zlib/*.vcproj -scripts/mysql_fix_privilege_tables.sql |