diff options
| author | unknown <pem@mysql.com> | 2003-12-05 13:11:50 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-12-05 13:11:50 +0100 |
| commit | 4cc04190304fed0f9e7378dfd92d645690631836 (patch) | |
| tree | a07a30ca097bfae53819a79e123ec4c4dd7d751b /.bzrignore | |
| parent | 7c3be1ba3900042ba97f966858b54589edfc9800 (diff) | |
| parent | 07de836b44434cbab033d02cc47879275080f65c (diff) | |
| download | mariadb-git-4cc04190304fed0f9e7378dfd92d645690631836.tar.gz | |
Merged 4.1 -> 5.0
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 5b2789733fc..5205124092d 100644 --- a/.bzrignore +++ b/.bzrignore @@ -74,6 +74,7 @@ Docs/safe-mysql.xml Docs/tex.fmt Docs/texi2dvi.out INSTALL-SOURCE +INSTALL-WIN-SOURCE Logs/* MIRRORS Makefile |