diff options
| author | unknown <igor@rurik.mysql.com> | 2004-10-19 16:07:10 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2004-10-19 16:07:10 -0700 |
| commit | a3e71bdbf54163ca8823aabc1c5938e5f593aa32 (patch) | |
| tree | c4a004a87cda30de2a6a2e8f1edd255d89e8a247 /.bzrignore | |
| parent | 24b608b23084f0576bd94066c887b4891d55233d (diff) | |
| parent | 05933f13f7466a0057b0d5689300ded9101588f8 (diff) | |
| download | mariadb-git-a3e71bdbf54163ca8823aabc1c5938e5f593aa32.tar.gz | |
Merge for post-merge fixes for Item_equal patch.
BitKeeper/etc/ignore:
auto-union
mysql-test/r/range.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/range.test:
Auto merged
sql/item.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/item.h:
Manual merge
sql/sql_select.cc:
Manual merge
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 396ff534680..c3d20201819 100644 --- a/.bzrignore +++ b/.bzrignore @@ -508,6 +508,7 @@ mysql-test/install_test_db mysql-test/mysql-test-run mysql-test/ndb/ndbcluster mysql-test/r/*.reject +mysql-test/r/index_merge_load.result mysql-test/r/rpl000001.eval mysql-test/r/rpl000002.eval mysql-test/r/rpl000014.eval @@ -518,6 +519,7 @@ mysql-test/r/slave-running.eval mysql-test/r/slave-stopped.eval mysql-test/share/mysql mysql-test/std_data/*.pem +mysql-test/t/index_merge.load mysql-test/var/* mysql.kdevprj mysql.proj |