diff options
author | unknown <petr@mysql.com> | 2004-11-04 02:57:31 +0300 |
---|---|---|
committer | unknown <petr@mysql.com> | 2004-11-04 02:57:31 +0300 |
commit | 14437e9c8f82a77b4f3f04e5b24b3c58db8e3a2b (patch) | |
tree | bae058b5ba3fbcdf419cf63b3c15c4aed5e43d4a /.bzrignore | |
parent | bb63229331d461baedecd0ef439914ff9458e441 (diff) | |
parent | e981c836104675533a2eb6810f7c1606377b0491 (diff) | |
download | mariadb-git-14437e9c8f82a77b4f3f04e5b24b3c58db8e3a2b.tar.gz |
Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
into mysql.com:/home/cps/mysql/devel/im/prereview/mysql-5.0
sql/net_serv.cc:
Auto merged
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index c3d20201819..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 |