diff options
| author | unknown <monty@mysql.com> | 2004-11-03 13:01:38 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-03 13:01:38 +0200 |
| commit | 614cda698a2c07ae158cbaf9a0a102a04866e28c (patch) | |
| tree | 39f6697332c041cfd44f3c685d341ba5024ca0f5 /.bzrignore | |
| parent | 09e0503538cbf882cdb1c215a45becfd3826d67a (diff) | |
| parent | f5a47f156b6778a0f6751556e56a0afe25d6be13 (diff) | |
| download | mariadb-git-614cda698a2c07ae158cbaf9a0a102a04866e28c.tar.gz | |
Merge on pull
BitKeeper/etc/ignore:
auto-union
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/sql_mode.result:
Auto merged
mysql-test/t/grant2.test:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore index 9d24a2443b0..c83b4ed4388 100644 --- a/.bzrignore +++ b/.bzrignore @@ -45,6 +45,19 @@ COPYING COPYING.LIB Docs/#manual.texi# Docs/INSTALL-BINARY +Docs/Images/myaccess-odbc.txt +Docs/Images/myaccess.txt +Docs/Images/myarchitecture.txt +Docs/Images/mydll-properties.txt +Docs/Images/mydsn-example.txt +Docs/Images/mydsn-icon.txt +Docs/Images/mydsn-options.txt +Docs/Images/mydsn-setup.txt +Docs/Images/mydsn-test-fail.txt +Docs/Images/mydsn-test-success.txt +Docs/Images/mydsn-trace.txt +Docs/Images/mydsn.txt +Docs/Images/myflowchart.txt Docs/include.texi Docs/internals.html Docs/internals.info @@ -829,7 +842,9 @@ sql_prepare.cc stamp-h stamp-h.in stamp-h1 +stamp-h1.in stamp-h2 +stamp-h2.in stamp-h3 stamp-h4 start_mysqld.sh @@ -924,5 +939,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -stamp-h1.in -stamp-h2.in |