diff options
| author | unknown <konstantin@mysql.com> | 2006-07-01 22:13:42 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-07-01 22:13:42 +0400 |
| commit | 4c2db1bef100a1159f65d3fad0ec764727198e58 (patch) | |
| tree | d95c3da90bd35eba6d137fa33a19459f9bdaf82f /sql/sp_rcontext.h | |
| parent | 047e2be28c9a4a51c2c0348f970f78bed6c601af (diff) | |
| parent | 697e8d71bbc0859694a320f3ac18e8053e183794 (diff) | |
| download | mariadb-git-4c2db1bef100a1159f65d3fad0ec764727198e58.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-runtime
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_sapdb.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/item.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sp_rcontext.h')
0 files changed, 0 insertions, 0 deletions