diff options
author | unknown <konstantin@mysql.com> | 2004-08-03 03:33:51 -0700 |
---|---|---|
committer | unknown <konstantin@mysql.com> | 2004-08-03 03:33:51 -0700 |
commit | a5debaea43e5164c55b899fdd7f7b20c3ef99d2d (patch) | |
tree | 1f890f453c5684d24a0e9457e58bcab87cda60f2 /mysql-test/r/ps_4heap.result | |
parent | efec129351986ac882f2ef9935fc21eebebba89f (diff) | |
parent | eaf34dd8e3383b92f3d6e2600fc6f6f9365c63fc (diff) | |
download | mariadb-git-a5debaea43e5164c55b899fdd7f7b20c3ef99d2d.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/kostja/mysql/mysql-5.0-sap-new
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/ps_4heap.result')
0 files changed, 0 insertions, 0 deletions