diff options
| author | cmiller@zippy.cornsilk.net <> | 2006-11-06 18:01:47 -0500 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2006-11-06 18:01:47 -0500 |
| commit | da6c5b18cc75be5b05aa2e132f4da4887462a425 (patch) | |
| tree | 9d3fc2e216f22b17667befe4e102d73d0bacad35 /BitKeeper/etc | |
| parent | e235c8c421ebabc39009c08a637a0c3f3b3486c4 (diff) | |
| parent | 87a5134b7c1197dc23f3cd37b5e31c50f70fd27e (diff) | |
| download | mariadb-git-da6c5b18cc75be5b05aa2e132f4da4887462a425.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my41-bug23411
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
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 60be7fa5dc6..37c2793cc12 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -1 +1,3 @@ 452a92d0-31-8wSzSfZi165fcGcXPA +454a7ef8gdvE_ddMlJyghvOAkKPNOQ +454f8960jsVT_kMKJtZ9OCgXoba0xQ |