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 | 84984f9111bf49418782eaa21b2d8cde41998eba (patch) | |
tree | 87f5726747166bd6e5b9054924de1bf12f852fb8 /debian/mysql-common.dirs.in | |
parent | 1dc0efc606bf7f66402e7f9728b7e4a0a1fd82ec (diff) | |
download | mariadb-git-84984f9111bf49418782eaa21b2d8cde41998eba.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 'debian/mysql-common.dirs.in')
0 files changed, 0 insertions, 0 deletions