diff options
| author | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-10-16 20:47:08 -0600 |
|---|---|---|
| committer | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-10-16 20:47:08 -0600 |
| commit | 40ea2b48ac88555af5eb8c5f0cc18bcefb4e1359 (patch) | |
| tree | 87f5726747166bd6e5b9054924de1bf12f852fb8 /sql/sp.cc | |
| parent | 4466dec3808c59fb9027895feb4b2f8f7192ccda (diff) | |
| download | mariadb-git-40ea2b48ac88555af5eb8c5f0cc18bcefb4e1359.tar.gz | |
Manual merge of 5.0-runtime to 5.1-runtime
mysql-test/r/sp-error.result:
Manual merge
mysql-test/r/sp.result:
Manual merge
mysql-test/r/udf.result:
Manual merge
mysql-test/t/sp.test:
Manual merge
mysql-test/t/udf.test:
Manual merge
sql/item_create.cc:
Manual merge
sql/sp_head.cc:
Manual merge
sql/sql_yacc.yy:
Manual merge
Diffstat (limited to 'sql/sp.cc')
0 files changed, 0 insertions, 0 deletions