diff options
| author | unknown <lars@black.(none)> | 2006-11-13 12:45:31 +0100 |
|---|---|---|
| committer | unknown <lars@black.(none)> | 2006-11-13 12:45:31 +0100 |
| commit | 36dfa434cc4f0aa31ef29f1a78f20c510bd93e9b (patch) | |
| tree | eb796a1a532ee9d10c8c44e5cd764977260d29a0 /BitKeeper/etc | |
| parent | ce963d0c8e3243b558ea54c11e8c5824b8dcf3b8 (diff) | |
| parent | 421f4c090739cc993ce336048df7c0284896e886 (diff) | |
| download | mariadb-git-36dfa434cc4f0aa31ef29f1a78f20c510bd93e9b.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
BitKeeper/etc/collapsed:
auto-union
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
Diffstat (limited to 'BitKeeper/etc')
| -rw-r--r-- | BitKeeper/etc/collapsed | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index 226f0f1a2e2..10bc7a2182a 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -15,5 +15,7 @@ 45214442pBGT9KuZEGixBH71jTzbOA 45214a07hVsIGwvwa-WrO-jpeaSwVw 452a92d0-31-8wSzSfZi165fcGcXPA +452c6c6dAjuNghfc1ObZ_UQ5SCl85g +4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg 454a7ef8gdvE_ddMlJyghvOAkKPNOQ 454f8960jsVT_kMKJtZ9OCgXoba0xQ |