diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-10-09 18:55:09 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-10-09 18:55:09 -0400 |
| commit | 525a7cb53b9091c40aa0bfa921b7e764167b0255 (patch) | |
| tree | b05243a856987ab13d8b51ad26cb9ae4c69441b2 /BitKeeper | |
| parent | 59d4e2438e5905a50ed97899c3582c6688f60bfb (diff) | |
| parent | 7a71766192edfba99685bcd8acb06f795b2e9083 (diff) | |
| download | mariadb-git-525a7cb53b9091c40aa0bfa921b7e764167b0255.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my51-bug17583
BitKeeper/etc/collapsed:
auto-union
client/mysql.cc:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/collapsed | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index 1d220fdb31d..e6d64f4f6ee 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -9,3 +9,4 @@ 451ab499rgdjXyOnUDqHu-wBDoS-OQ 45214442pBGT9KuZEGixBH71jTzbOA 45214a07hVsIGwvwa-WrO-jpeaSwVw +452a92d0-31-8wSzSfZi165fcGcXPA |