diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-11-11 08:57:26 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-11-11 08:57:26 -0500 |
| commit | 4f4b46456a150880d5d93d77a2f9f0db68d9396c (patch) | |
| tree | 659cbf6be1c0a88047c9f0d75f138054eb435190 /BitKeeper | |
| parent | 3a86738289ea6d587d17aebab4f5d9967c9bba99 (diff) | |
| parent | 93e1030ddda4d2b4ccef0481354fb7185bc1fc97 (diff) | |
| download | mariadb-git-4f4b46456a150880d5d93d77a2f9f0db68d9396c.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my41-bug22860
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860
BitKeeper/deleted/.del-collapsed~fbec3523369aae99:
Delete: BitKeeper/etc/collapsed
BitKeeper/etc/collapsed:
'Auto converge'
sql/mysqld.cc:
manual merge
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..ddaafba882c 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -17,3 +17,5 @@ 452a92d0-31-8wSzSfZi165fcGcXPA 454a7ef8gdvE_ddMlJyghvOAkKPNOQ 454f8960jsVT_kMKJtZ9OCgXoba0xQ +4554a95d7txO1DuO9G3nAizI3SkFAA +4554b3722d71SbPiI2Gx-RhbZjmuIQ |