Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new storage/ndb/include/kernel/signaldata/TupFrag.hpp: Auto merged storage/ndb/include/util/NdbSqlUtil.hpp: Auto merged storage/ndb/src/common/util/NdbSqlUtil.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp: Auto merged mysql-test/r/ndb_bitfield.result: Merge, will generate new result file manually storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Merge
Showing
Please register or sign in to comment