diff options
author | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-10-18 21:36:10 -0600 |
---|---|---|
committer | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-10-18 21:36:10 -0600 |
commit | b0488a32038ca9abf8e9ec8ec2482598aca133ab (patch) | |
tree | 8c58cce3d12a266f24fca742ef14f9bbe8f047be /scripts/mysql_system_tables.sql | |
parent | 244fb387a37c5075e9a2502f91695eab6a6f852c (diff) | |
parent | d927461052084fc876151c42ea9502b5bf3fef4a (diff) | |
download | mariadb-git-b0488a32038ca9abf8e9ec8ec2482598aca133ab.tar.gz |
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-runtime
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-runtime
mysql-test/r/udf.result:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/udf_example.c:
Auto merged
sql/udf_example.def:
Auto merged
Diffstat (limited to 'scripts/mysql_system_tables.sql')
0 files changed, 0 insertions, 0 deletions