diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-27 15:48:40 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-27 15:48:40 -0400 |
| commit | 4c43c2016c0e550c8ac791f13e18bd59d1c420a2 (patch) | |
| tree | f2402274a4e56289538ef04b94eb1ee062b0a025 /BitKeeper | |
| parent | b561dd1e8858b3654a54a7f453bb28b72fd8b984 (diff) | |
| parent | 7f221a1837f209c54c0ee1393bc3e1ee0d34343f (diff) | |
| download | mariadb-git-4c43c2016c0e550c8ac791f13e18bd59d1c420a2.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my50-bug21476
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476
client/mysqltest.c:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
sql/mysql_priv.h:
Auto merged
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 fd33e4fc902..a4f24702b58 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -3,3 +3,5 @@ 44edb86b1iE5knJ97MbliK_3lCiAXA 44f33f3aj5KW5qweQeekY1LU0E9ZCg 4513d8e4Af4dQWuk13sArwofRgFDQw +4519a6c5BVUxEHTf5iJnjZkixMBs8g +451ab499rgdjXyOnUDqHu-wBDoS-OQ |