diff options
| author | unknown <jimw@mysql.com> | 2006-02-17 10:59:47 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-02-17 10:59:47 -0800 |
| commit | 1b587ced223f6f4d2a7d683c3062d622019c9fb8 (patch) | |
| tree | 57f325a6809e5f37e0ab5611893ed0da5dd2ca62 /.bzrignore | |
| parent | 46c6908479aeef008527f21718629259c0440b58 (diff) | |
| parent | eae6679fd4a55a1798f2c20385507f869c85e7a6 (diff) | |
| download | mariadb-git-1b587ced223f6f4d2a7d683c3062d622019c9fb8.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into mysql.com:/home/jimw/my/mysql-5.1-clean
BitKeeper/etc/ignore:
auto-union
mysql-test/r/func_str.result:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
mysql-test/t/disabled.def:
Resolve conflict
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index d6d84003198..21383779fa7 100644 --- a/.bzrignore +++ b/.bzrignore @@ -934,6 +934,7 @@ scripts/mysql_install_db scripts/mysql_secure_installation scripts/mysql_setpermission scripts/mysql_tableinfo +scripts/mysql_upgrade scripts/mysql_zap scripts/mysqlaccess scripts/mysqlbug @@ -1613,4 +1614,3 @@ vio/viotest-sslconnect.cpp vio/viotest.cpp zlib/*.ds? zlib/*.vcproj -scripts/mysql_upgrade |