diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-02-26 14:25:59 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-02-26 14:25:59 +0100 |
| commit | c431ab112dd1afb34a8e5029c638ccf0289a78cf (patch) | |
| tree | 51cdb10a0d9eb61b6b3036f2ec898e83f357c172 /.bzrignore | |
| parent | 1e98e7bfb241ec843bb289503c24bff34fbfe01f (diff) | |
| parent | 5d4e0417ad5a4b7758f216f86ad91b97287eec29 (diff) | |
| download | mariadb-git-c431ab112dd1afb34a8e5029c638ccf0289a78cf.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
into pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
Auto merged
BitKeeper/deleted/.del-mysql_create_system_tables.sh:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/join.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/init_connect.test:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
mysql-test/t/ndb_index_ordered.test:
Auto merged
mysql-test/t/ndb_multi.test:
Auto merged
scripts/Makefile.am:
Auto merged
BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
Auto merged
mysql-test/r/mysql_upgrade.result:
SCCS merged
mysql-test/t/lock_multi.test:
Use local
mysql-test/t/rpl_temporary.test:
Use local
mysql-test/Makefile.am:
Manual merge
scripts/mysql_fix_privilege_tables.sh:
Manual merge
scripts/mysql_fix_privilege_tables.sql.in:
Manual merge
scripts/mysql_install_db.sh:
Manual merge
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 58ec0a63c17..6bb1ebef69b 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1813,6 +1813,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 |