diff options
| author | unknown <hhunger@hh-nb.hhunger> | 2007-11-26 22:19:39 +0100 |
|---|---|---|
| committer | unknown <hhunger@hh-nb.hhunger> | 2007-11-26 22:19:39 +0100 |
| commit | c916a0761b475f87f88ae4efe7b055a6af1f862d (patch) | |
| tree | 3c920510245d33f14b19249278c6ce17ffca693f /.bzrignore | |
| parent | 9cf1b1859330d6feab9f4b0af7d90eae2ea32266 (diff) | |
| parent | 77f59b989cacc3aa4147047f5b8ffdd1a3c8c98d (diff) | |
| download | mariadb-git-c916a0761b475f87f88ae4efe7b055a6af1f862d.tar.gz | |
Merge hh-nb.hhunger:/work/merge/mysql-5.0-32496
into hh-nb.hhunger:/work/merge/mysql-5.1-32496
BitKeeper/etc/ignore:
auto-union
mysql-test/suite/funcs_1/r/innodb_views.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
Auto merged
mysql-test/suite/funcs_1/r/myisam_views.result:
used ul
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 975ae7c7168..2a9dd6d41c8 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1845,6 +1845,7 @@ scripts/make_binary_distribution scripts/make_sharedlib_distribution scripts/make_win_binary_distribution scripts/make_win_src_distribution +scripts/make_win_src_distribution_old scripts/msql2mysql scripts/mysql_config scripts/mysql_convert_table_format |