diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-11-13 13:17:02 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-11-13 13:17:02 -0500 |
| commit | 3d0211482439461a7e5e66c4e74e308379569f31 (patch) | |
| tree | e106587572ba6ee3a8705be2e0a626497dc280f5 /BitKeeper/etc | |
| parent | 2e35e44899ff50bef3495b6c0a7f6a77e623ef58 (diff) | |
| parent | 154c6e06775d6e644fd4e5f863104ab566fc4a68 (diff) | |
| download | mariadb-git-3d0211482439461a7e5e66c4e74e308379569f31.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my50-bug18761
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my51-bug18761
BitKeeper/etc/collapsed:
auto-union
mysql-test/r/udf.result:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/udf_example.c:
Auto merged
Diffstat (limited to 'BitKeeper/etc')
| -rw-r--r-- | BitKeeper/etc/collapsed | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index 311c3813abf..357e2c84566 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -15,3 +15,11 @@ 45214442pBGT9KuZEGixBH71jTzbOA 45214a07hVsIGwvwa-WrO-jpeaSwVw 452a92d0-31-8wSzSfZi165fcGcXPA +454bb488ijVLOUK_GFjcoISE0GxPUA +454bb9a8AwlGRC_wWLS2sNMoRBMRGw +454c946ciQoR4dfTBZ0RTBmGJKp6lw +454f6e7eAnfLD9OCbGr5X9KiKvfKcQ +454f704bJiJy0_Nx2drY9P5kK3uOzg +454fa71cxshxszXJQYa9jbo0-_hAHw +4550b0ceIcozdgQhWFUTAtWkN196lA +4558b3d73Cxjlb7Wv1oytdSTthxDfw |