diff options
| author | monty@mysql.com <> | 2005-07-27 13:24:59 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-07-27 13:24:59 +0300 |
| commit | 24d45c5c305b0137caa50ff9b58da195c6f02f90 (patch) | |
| tree | 7f3dd2c80370d2c811475198141e5ab89b19adb0 /.bzrignore | |
| parent | 3f6023c76e231a7126eef76b97075056348a55bf (diff) | |
| parent | 4098c40d87ac11fe5043061f16a95a455376a782 (diff) | |
| download | mariadb-git-24d45c5c305b0137caa50ff9b58da195c6f02f90.tar.gz | |
Merge mysql.com:/home/my/mysql-4.0
into mysql.com:/home/my/mysql-4.1
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index 174fc6020f2..093c9b2f2bc 100644 --- a/.bzrignore +++ b/.bzrignore @@ -890,6 +890,7 @@ scripts/mysqld_multi scripts/mysqld_safe scripts/mysqldumpslow scripts/mysqlhotcopy +scripts/mysqlhotcopy.sh.rej scripts/safe_mysqld select_test sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686 @@ -1052,4 +1053,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -scripts/mysqlhotcopy.sh.rej |