diff options
| author | unknown <lars@mysql.com/black.(none)> | 2006-11-13 12:44:53 +0100 |
|---|---|---|
| committer | unknown <lars@mysql.com/black.(none)> | 2006-11-13 12:44:53 +0100 |
| commit | 181c9b4dd4c23c5ef4d8c2562c055e35b6267bfe (patch) | |
| tree | 2e35d48c7436cf853a6515a4dccc4e72660d82f3 /BitKeeper | |
| parent | 383fbde53239a9d4fd4e444a0b6d8942305f74f5 (diff) | |
| parent | 7614eb0d1db4819ec6f1c3c59196d1dcb0d0c8d5 (diff) | |
| download | mariadb-git-181c9b4dd4c23c5ef4d8c2562c055e35b6267bfe.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-5.0-rpl
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
BitKeeper/etc/collapsed:
auto-union
sql/mysql_priv.h:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -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 |