diff options
author | unknown <mskold/marty@mysql.com/linux.site> | 2006-12-04 15:09:47 +0100 |
---|---|---|
committer | unknown <mskold/marty@mysql.com/linux.site> | 2006-12-04 15:09:47 +0100 |
commit | 6b60322131d9396d3fd9508e36a297b8f3ea1218 (patch) | |
tree | 76998dce9d271ba78a4152a6f4b2bdcbd2925967 /sql/sql_view.cc | |
parent | 1172c8ae5568374de74037644a9a082722df9fab (diff) | |
parent | 7d3bf44e610078bdad6f265a4b453773e2aea0f9 (diff) | |
download | mariadb-git-6b60322131d9396d3fd9508e36a297b8f3ea1218.tar.gz |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'sql/sql_view.cc')
0 files changed, 0 insertions, 0 deletions