diff options
author | unknown <sasha@mysql.sashanet.com> | 2001-06-29 09:55:21 -0600 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2001-06-29 09:55:21 -0600 |
commit | 0a6cf93d23f42b3060b324b7f7a71cfcce7507f9 (patch) | |
tree | ac0ec753f8980e75aeb9b64d300e0d91af7ea89c /.bzrignore | |
parent | 1ed2bcc8889f6b968c473044caaeefd603bb377b (diff) | |
download | mariadb-git-0a6cf93d23f42b3060b324b7f7a71cfcce7507f9.tar.gz |
post-merge fix
fixed bug in LOAD DATA FROM MASTER
BitKeeper/etc/ignore:
Added scripts/mysqld_safe to the ignore list
sql/mysqld.cc:
post-merge fix
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index e8383bf4f64..74c60fc94a7 100644 --- a/.bzrignore +++ b/.bzrignore @@ -370,3 +370,4 @@ libmysqld/stacktrace.c sql/share/mysql .gdbinit .vimrc +scripts/mysqld_safe |