diff options
| author | unknown <pem@mysql.com> | 2005-12-02 15:04:50 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2005-12-02 15:04:50 +0100 |
| commit | 110b887c4e6bbe27577c1ade5dfbc9479957bf20 (patch) | |
| tree | df11e0fd1fcfdb791220357e68a8ed1a993af8c2 /ndb | |
| parent | 858eef452fd1c32bbbf672720043ddcedf6095ce (diff) | |
| parent | a9086bc75cbd676eb065ca660edab222df0b097e (diff) | |
| download | mariadb-git-110b887c4e6bbe27577c1ade5dfbc9479957bf20.tar.gz | |
Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/usr/home/pem/bug14376/mysql-5.0
sql/sp_pcontext.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/sp.result:
SCCS merged
mysql-test/t/sp.test:
SCCS merged
sql/sp_pcontext.h:
SCCS merged
Diffstat (limited to 'ndb')
0 files changed, 0 insertions, 0 deletions