From: magnus.blaudd Date: March 5 2012 2:18pm Subject: bzr push into mysql-trunk-cluster branch (magnus.blaudd:3642 to 3644) List-Archive: http://lists.mysql.com/commits/143090 Message-Id: <201203051418.q25EIhWx006462@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3644 magnus.blaudd@stripped 2011-12-13 [merge] ndb - cherry pick removal of a few more automake files from trunk-cluster-merge removed: storage/ndb/plug.in storage/ndb/src/libndb.ver.in 3643 magnus.blaudd@stripped 2011-12-13 [merge] ndb - cherry pick removal of storage/ndb/src/external and storage/ndb/test/odbc from trunk-cluster-merge removed: storage/ndb/src/external/ storage/ndb/src/external/WIN32.x86/ storage/ndb/src/external/WIN32.x86/sci/ storage/ndb/src/external/WIN32.x86/sci/lib/ storage/ndb/src/external/WIN32.x86/sci/lib/SISCI_LIBRARY_WIN32.TXT storage/ndb/src/external/WIN32.x86/sci/lib/scilib.lib storage/ndb/src/external/WIN32.x86/sci/lib/scilib_md.lib storage/ndb/src/external/WIN32.x86/sci/lib/scilib_mt.lib storage/ndb/src/external/WIN32.x86/sci/lib/sisci_api.lib storage/ndb/src/external/WIN32.x86/sci/lib/sisci_api_md.lib storage/ndb/src/external/WIN32.x86/sci/lib/sisci_api_mt.lib storage/ndb/test/odbc/ storage/ndb/test/odbc/SQL99_test/ storage/ndb/test/odbc/SQL99_test/Makefile storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp storage/ndb/test/odbc/SQL99_test/SQL99_test.h storage/ndb/test/odbc/client/ storage/ndb/test/odbc/client/Makefile storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp storage/ndb/test/odbc/client/SQLBindColTest.cpp storage/ndb/test/odbc/client/SQLBindParameterTest.cpp storage/ndb/test/odbc/client/SQLCancelTest.cpp storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp storage/ndb/test/odbc/client/SQLColAttributeTest.cpp storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp storage/ndb/test/odbc/client/SQLConnectTest.cpp storage/ndb/test/odbc/client/SQLCopyDescTest.cpp storage/ndb/test/odbc/client/SQLDescribeColTest.cpp storage/ndb/test/odbc/client/SQLDisconnectTest.cpp storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp storage/ndb/test/odbc/client/SQLEndTranTest.cpp storage/ndb/test/odbc/client/SQLErrorTest.cpp storage/ndb/test/odbc/client/SQLExecDirectTest.cpp storage/ndb/test/odbc/client/SQLExecuteTest.cpp storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp storage/ndb/test/odbc/client/SQLFetchTest.cpp storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp storage/ndb/test/odbc/client/SQLGetDataTest.cpp storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp storage/ndb/test/odbc/client/SQLGetInfoTest.cpp storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp storage/ndb/test/odbc/client/SQLParamDataTest.cpp storage/ndb/test/odbc/client/SQLPrepareTest.cpp storage/ndb/test/odbc/client/SQLPutDataTest.cpp storage/ndb/test/odbc/client/SQLRowCountTest.cpp storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp storage/ndb/test/odbc/client/SQLTablesTest.cpp storage/ndb/test/odbc/client/SQLTransactTest.cpp storage/ndb/test/odbc/client/common.hpp storage/ndb/test/odbc/client/main.cpp storage/ndb/test/odbc/dm-iodbc/ storage/ndb/test/odbc/dm-iodbc/Makefile storage/ndb/test/odbc/dm-unixodbc/ storage/ndb/test/odbc/dm-unixodbc/Makefile storage/ndb/test/odbc/driver/ storage/ndb/test/odbc/driver/Makefile storage/ndb/test/odbc/driver/testOdbcDriver.cpp storage/ndb/test/odbc/test_compiler/ storage/ndb/test/odbc/test_compiler/Makefile storage/ndb/test/odbc/test_compiler/test_compiler.cpp 3642 magnus.blaudd@stripped 2011-12-09 ndb - I_List::append renamed to I_List::push_front - fix one place where that function was used modified: sql/ha_ndbcluster_binlog.cc Diff too large for email (18979 lines, the limit is 10000). No bundle (reason: useless for push emails).