diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-10-04 11:29:16 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-10-04 11:29:16 -0400 |
| commit | 978989a5ac25bcad8d73b282d45754826d18dd0d (patch) | |
| tree | df205404378267df0e8915390da8f19d7cd0f33d /BitKeeper/etc/collapsed | |
| parent | efd91571fbf97809b32db5f715deddeae8c1c501 (diff) | |
| parent | f60ea28841ee37627e1997850ad0a5c5bd311bc2 (diff) | |
| download | mariadb-git-978989a5ac25bcad8d73b282d45754826d18dd0d.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug19356/my50-bug19356
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug19356/my51-bug19356
BitKeeper/etc/collapsed:
auto-union
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'BitKeeper/etc/collapsed')
| -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 a4f24702b58..0eb8a32482d 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -5,3 +5,5 @@ 4513d8e4Af4dQWuk13sArwofRgFDQw 4519a6c5BVUxEHTf5iJnjZkixMBs8g 451ab499rgdjXyOnUDqHu-wBDoS-OQ +45214442pBGT9KuZEGixBH71jTzbOA +45214a07hVsIGwvwa-WrO-jpeaSwVw |