diff options
author | cmiller@zippy.cornsilk.net <> | 2006-11-06 17:45:47 -0500 |
---|---|---|
committer | cmiller@zippy.cornsilk.net <> | 2006-11-06 17:45:47 -0500 |
commit | 40170fbf58c84f9a5186adcb418ffa7b83104ae3 (patch) | |
tree | 127b0d7799600812e018834954dd045f5a5fa68c /BitKeeper | |
parent | 56f10ac81a9eefe03a1c0e0bbb25d928c64db6b3 (diff) | |
parent | 87a5134b7c1197dc23f3cd37b5e31c50f70fd27e (diff) | |
download | mariadb-git-40170fbf58c84f9a5186adcb418ffa7b83104ae3.tar.gz |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my41-bug23411
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my50-bug23411
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 311c3813abf..226f0f1a2e2 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -15,3 +15,5 @@ 45214442pBGT9KuZEGixBH71jTzbOA 45214a07hVsIGwvwa-WrO-jpeaSwVw 452a92d0-31-8wSzSfZi165fcGcXPA +454a7ef8gdvE_ddMlJyghvOAkKPNOQ +454f8960jsVT_kMKJtZ9OCgXoba0xQ |