diff options
| author | unknown <monty@mysql.com> | 2006-06-30 20:07:33 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-06-30 20:07:33 +0300 |
| commit | 0bbc6fbeb7cb60d263510ce1f4c116a69ec77f95 (patch) | |
| tree | da64f683229006c098861b31377eeea29039ae5c /.bzrignore | |
| parent | 9606675ba20eb309a1f402f92d06e2de8aed22d2 (diff) | |
| download | mariadb-git-0bbc6fbeb7cb60d263510ce1f4c116a69ec77f95.tar.gz | |
After merge fixes
BitKeeper/etc/ignore:
added scripts/mysql_upgrade_shell
include/my_handler.h:
my_handler.h should not include my_global.h
mysql-test/r/key.result:
Update results after merge
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index ef02a085144..7ea7f1ab7e2 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1286,3 +1286,5 @@ vio/viotest.cpp zlib/*.ds? zlib/*.vcproj BitKeeper/etc/RESYNC_TREE +mysql-test/r/*.log +scripts/mysql_upgrade_shell |