diff options
| author | unknown <monty@mysql.com/nosik.monty.fi> | 2006-11-20 22:46:52 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/nosik.monty.fi> | 2006-11-20 22:46:52 +0200 |
| commit | 886965303155d1c2fbd90e3606fd192d4ba7741b (patch) | |
| tree | 352c3fca9ea50d4ca34dacb71d6f6ec2a89df543 /.bzrignore | |
| parent | daaddeb656c26c685962fef69d19e7f264620e2b (diff) | |
| parent | 14decc4fbc04b8ce0c5efb7d76b711c6e60a0266 (diff) | |
| download | mariadb-git-886965303155d1c2fbd90e3606fd192d4ba7741b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
mysql-test/t/ctype_ucs.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index e167619c1a6..d6086ba4a76 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1322,3 +1322,4 @@ win/vs71cache.txt win/vs8cache.txt zlib/*.ds? zlib/*.vcproj +mysql-test/r/*.warnings |