diff options
| author | unknown <kaa@kaamos.(none)> | 2008-03-11 15:47:16 +0300 |
|---|---|---|
| committer | unknown <kaa@kaamos.(none)> | 2008-03-11 15:47:16 +0300 |
| commit | a5e775b4d657b9521f60b06cf8f19a9a1741c668 (patch) | |
| tree | f4671791fd93a024ab59a147a73d18bcad3af656 /sql/item_func.h | |
| parent | 74783c5713dfe91c0bf6535c9090c860e531b57e (diff) | |
| parent | 0abcb8ca5e3662d230446907469dc4facbb755ad (diff) | |
| download | mariadb-git-a5e775b4d657b9521f60b06cf8f19a9a1741c668.tar.gz | |
Merge kaamos.(none):/data/src/opt/mysql-5.0-opt
into kaamos.(none):/data/src/opt/mysql-5.1-opt
mysql-test/r/func_misc.result:
Auto merged
mysql-test/r/null_key.result:
Auto merged
mysql-test/t/func_misc.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_select.cc:
Manual merge.
Diffstat (limited to 'sql/item_func.h')
0 files changed, 0 insertions, 0 deletions