diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2007-01-18 17:10:00 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2007-01-18 17:10:00 +0400 |
| commit | 50f32533f976b20f01c6c47b5b455cb2a9f67c7e (patch) | |
| tree | cbe729d91bbe26620386d19aebf2958fa4e2ffae /mysql-test/r/func_if.result | |
| parent | 9bca6ffa4135e3a58c062a46eae096bccdd8113c (diff) | |
| parent | 368d6b2794040a02911dbc9a358575e930691596 (diff) | |
| download | mariadb-git-50f32533f976b20f01c6c47b5b455cb2a9f67c7e.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
mysql-test/r/type_bit.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/func_if.result')
0 files changed, 0 insertions, 0 deletions