diff options
| author | unknown <petr@mysql.com> | 2004-12-09 04:22:28 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2004-12-09 04:22:28 +0300 |
| commit | f7ef17dda1a062d74028ca2967b3d8506354d803 (patch) | |
| tree | 6b81e45da104e71d355f27b8abaf834a2f10eeab /.bzrignore | |
| parent | d11d6d697113297de7f2533703f3db89d1b7835d (diff) | |
| parent | b5536bb962da6751bbc62ef9b7aba720bb04d018 (diff) | |
| download | mariadb-git-f7ef17dda1a062d74028ca2967b3d8506354d803.tar.gz | |
merge
BitKeeper/etc/ignore:
auto-union
server-tools/instance-manager/mysqlmanager.cc:
Auto merged
sql/net_serv.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index f675b1a9e5a..e47629f14ec 100644 --- a/.bzrignore +++ b/.bzrignore @@ -538,6 +538,7 @@ myisam/test2.MYD myisam/test2.MYI mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz mysql-4.0.2-alpha.tar.gz +mysql-5.0.2-alpha.tar.gz mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz mysql-test/gmon.out mysql-test/install_test_db @@ -816,7 +817,11 @@ scripts/mysqldumpslow scripts/mysqlhotcopy scripts/safe_mysqld select_test +server-tools/instance-manager/client.c +server-tools/instance-manager/client_settings.h +server-tools/instance-manager/errmsg.c server-tools/instance-manager/mysqlmanager +server-tools/instance-manager/thr_alarm.c sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686 sql-bench/bench-count-distinct sql-bench/bench-init.pl |