diff options
author | unknown <joreland@mysql.com> | 2004-11-29 09:28:23 +0100 |
---|---|---|
committer | unknown <joreland@mysql.com> | 2004-11-29 09:28:23 +0100 |
commit | 98cbdf4e21c7b39796cf5acec9acf48c2676a1d4 (patch) | |
tree | 322636ea5ce311d74d09af445867e751fa63571b /netware/mysql_waitpid.def | |
parent | 2d527b72f3e1c6c32800af489ea7b275be64bd12 (diff) | |
parent | d212891f6f0c0de275190f52672f3346979e07c0 (diff) | |
download | mariadb-git-98cbdf4e21c7b39796cf5acec9acf48c2676a1d4.tar.gz |
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0
ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
Diffstat (limited to 'netware/mysql_waitpid.def')
0 files changed, 0 insertions, 0 deletions