diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-10-09 18:46:28 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-10-09 18:46:28 -0400 |
| commit | 426b0f45a644472b59c6f337cbcd70f731b32ab8 (patch) | |
| tree | 7fbf052b3cfeaf4c5d77539748b183f7ee90003d /BitKeeper | |
| parent | c317c2d224c8d7753cf7acd238968a9a8584dbc4 (diff) | |
| parent | 76b353d307a3037e52c309169be644b47655ea0e (diff) | |
| download | mariadb-git-426b0f45a644472b59c6f337cbcd70f731b32ab8.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my41-bug17583
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
BitKeeper/deleted/.del-collapsed~fbec3523369aae99:
Delete: BitKeeper/etc/collapsed
BitKeeper/etc/collapsed:
'Auto converge'
client/mysql.cc:
Auto merged
BitKeeper/deleted/.del-mysql_client.result:
File is gone.
BitKeeper/deleted/.del-mysql_client.test:
File is gone.
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 fd33e4fc902..6eb31cf4571 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -3,3 +3,4 @@ 44edb86b1iE5knJ97MbliK_3lCiAXA 44f33f3aj5KW5qweQeekY1LU0E9ZCg 4513d8e4Af4dQWuk13sArwofRgFDQw +452a92d0-31-8wSzSfZi165fcGcXPA |