diff options
author | unknown <monty@mysql.com> | 2005-07-27 13:24:59 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2005-07-27 13:24:59 +0300 |
commit | d70aead730c1043ddcee0a8cd8a1f5dffafaf402 (patch) | |
tree | 7f3dd2c80370d2c811475198141e5ab89b19adb0 /.bzrignore | |
parent | 8bb396dc1442861e11758c8ac410af129a5c359e (diff) | |
parent | 90e41facf78150df4f8d387f6d44647957c7a8a0 (diff) | |
download | mariadb-git-d70aead730c1043ddcee0a8cd8a1f5dffafaf402.tar.gz |
Merge mysql.com:/home/my/mysql-4.0
into mysql.com:/home/my/mysql-4.1
BitKeeper/etc/ignore:
auto-union
include/thr_lock.h:
Auto merged
mysys/thr_lock.c:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Simple merge
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 |