diff options
author | unknown <anjuta@arthur.local> | 2005-01-13 19:14:10 +0200 |
---|---|---|
committer | unknown <anjuta@arthur.local> | 2005-01-13 19:14:10 +0200 |
commit | 111587e9e380693a2437635d67da51111b77d37b (patch) | |
tree | b2e0d5fb70ad167a712a507c2ae7c24769545aeb /.bzrignore | |
parent | 9d983c4550cf8e5c5342509f6508ca0e35600acd (diff) | |
parent | 388cd3a7c4b7b14a2529cc757f2e18a7c127997e (diff) | |
download | mariadb-git-111587e9e380693a2437635d67da51111b77d37b.tar.gz |
Merge
BitKeeper/etc/ignore:
auto-union
innobase/os/os0proc.c:
Auto merged
sql/share/errmsg.txt:
Auto merged
extra/comp_err.c:
SCCS merged
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 951a811f8e4..f27193d0adf 100644 --- a/.bzrignore +++ b/.bzrignore @@ -307,6 +307,7 @@ extra/my_print_defaults extra/mysql_install extra/mysql_tzinfo_to_sql extra/mysql_waitpid +extra/mysqld_ername.h extra/mysqld_error.h extra/perror extra/replace |