BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/include/kernel/LogLevel.hpp:
Auto merged
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/common/debugger/EventLogger.cpp:
Auto merged
ndb/src/common/logger/FileLogHandler.cpp:
Auto merged
ndb/src/common/logger/Logger.cpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/mgmsrv/Services.hpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/tools/Makefile.am:
Auto merged
into mysql.com:/home/jonas/src/wl1744
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
added extra calls to retrieve connectstring used
reengineered connect somewhat to make retries etc explicit
mysql-test/r/ndb_index_unique.result:
fixed error in test result
ndb/include/mgmapi/mgmapi.h:
added extra calls to retrieve connectstring used
ndb/include/mgmcommon/ConfigRetriever.hpp:
added extra calls to retrieve connectstring used
ndb/include/ndbapi/ndb_cluster_connection.hpp:
added extra calls to retrieve connectstring used
reengineered connect somewhat to make retries etc explicit
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
added extra calls to retrieve connectstring used
ndb/src/mgmapi/mgmapi.cpp:
added extra calls to retrieve connectstring used
ndb/src/mgmclient/CommandInterpreter.cpp:
moved parse of quit to avoid connect before
ndb/src/ndbapi/Ndbinit.cpp:
reengineered connect somewhat to make retries etc explicit
ndb/src/ndbapi/ndb_cluster_connection.cpp:
added extra calls to retrieve connectstring used
reengineered connect somewhat to make retries etc explicit
ndb/tools/listTables.cpp:
reengineered connect somewhat to make retries etc explicit
sql/ha_ndbcluster.cc:
added extra calls to retrieve connectstring used
reengineered connect somewhat to make retries etc explicit
into mysql.com:/home/jonas/src/mysql-4.1
mysql-test/r/ndb_index_unique.result:
Auto merged
mysql-test/t/ndb_index_unique.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
mysql-test/r/ndb_index_unique.result:
Test of unique index and null
mysql-test/t/ndb_index_unique.test:
Test of unique index and null
sql/ha_ndbcluster.cc:
Fixed long overdue problems with unique indexes and null values
prepared for using query cache in ndb
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
added force send interface to scan
ndb/include/ndbapi/NdbResultSet.hpp:
added force send interface to scan
ndb/include/ndbapi/NdbScanOperation.hpp:
added force send interface to scan
ndb/src/ndbapi/NdbResultSet.cpp:
added force send interface to scan
ndb/src/ndbapi/NdbScanOperation.cpp:
added force send interface to scan
- ndb_use_exact_count
- ndb_autoincrement_prefetch_sz
- ndb_use_transactions
- ndb_force_send
moved "inlined" functions to .cc file since they are virtual anyways
enabled printout od ndb errors in warnings even if mapping existst to mysql error code
sql/ha_ndbcluster.h:
Enabled usage of new system variables for ndb
- ndb_use_exact_count
- ndb_autoincrement_prefetch_sz
- ndb_use_transactions
- ndb_force_send
moved "inlined" functions to .cc file since they are virtual anyways
sql/mysqld.cc:
Enabled usage of new system variables for ndb
- ndb_use_exact_count
- ndb_autoincrement_prefetch_sz
- ndb_use_transactions
- ndb_force_send
sql/set_var.cc:
Enabled usage of new system variables for ndb
- ndb_use_exact_count
- ndb_autoincrement_prefetch_sz
- ndb_use_transactions
- ndb_force_send
sql/sql_class.h:
Enabled usage of new system variables for ndb
- ndb_use_exact_count
- ndb_autoincrement_prefetch_sz
- ndb_use_transactions
- ndb_force_send
into mysql.com:/home/jonas/src/wl1744
configure.in:
Auto merged
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/src/common/mgmcommon/Makefile.am:
Auto merged
ndb/src/common/mgmcommon/NdbConfig.c:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/Makefile.am:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
DROP DATABASE failed because of file ext not in TYPELIB of known extensions.
General solution - construct a TYPELIB at runtime instead of a static list.
mysql-test/r/ndb_basic.result:
Bug#6031
New test for bug
mysql-test/t/ndb_basic.test:
Bug#6031
New test for bug
sql/ha_ndbcluster.cc:
Cosmetic fix
sql/handler.cc:
Bug#6031
New function - ha_known_exts()
We can construct TYPELIB of known db file extensions.
sql/handler.h:
Bug#6031
New function - ha_known_exts()
sql/sql_db.cc:
Bug#6031
We use a constructed list of known extensions instead of a static list
ndb/include/kernel/signaldata/RepImpl.hpp:
more win-compile-fixes
ndb/include/mgmapi/mgmapi.h:
more win-compile-fixes
ndb/include/ndbapi/NdbConnection.hpp:
more win-compile-fixes
ndb/src/common/util/Properties.cpp:
more win-compile-fixes
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
more win-compile-fixes
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
more win-compile-fixes
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
more win-compile-fixes
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
more win-compile-fixes
ndb/src/kernel/blocks/grep/Grep.cpp:
more win-compile-fixes
ndb/src/mgmsrv/Config.cpp:
more win-compile-fixes
ndb/src/mgmsrv/ConfigInfo.cpp:
more win-compile-fixes
ndb/src/mgmsrv/InitConfigFileParser.cpp:
more win-compile-fixes
ndb/src/ndbapi/NdbBlob.cpp:
more win-compile-fixes
ndb/src/ndbapi/NdbConnection.cpp:
more win-compile-fixes
ndb/src/ndbapi/NdbImpl.hpp:
more win-compile-fixes
ndb/src/ndbapi/NdbOperationExec.cpp:
more win-compile-fixes
ndb/test/ndbapi/testOperations.cpp:
more win-compile-fixes
sql/ha_ndbcluster.cc:
more win-compile-fixes
fix null handling in ha_ndbcluster when using ordered index
mysql-test/r/ndb_index_ordered.result:
bug#6435
mysql-test/t/ndb_index_ordered.test:
bug#6435
sql/ha_ndbcluster.cc:
Fix null handling in ordered index code
1) fix so that missing blob tables don't prevent table from being
dropped
2) decrease size of blob part if record length exceeds max length
3) add test case for table wo/ corresponding blob table
4) init scan counters when sending scan_tabreq
mysql-test/r/ndb_autodiscover.result:
testcase for table wo/ corresponding blob tables
mysql-test/r/ndb_autodiscover2.result:
testcase for table wo/ corresponding blob tables
mysql-test/t/ndb_autodiscover.test:
testcase for table wo/ corresponding blob tables
mysql-test/t/ndb_autodiscover2.test:
testcase for table wo/ corresponding blob tables
ndb/include/ndbapi/NdbDictionary.hpp:
Add non-const get column
ndb/src/ndbapi/NdbDictionary.cpp:
Add non-const get column
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Allow "partially" getTable, which enables dropping of tables
that fails to create blob tables
ndb/src/ndbapi/NdbScanOperation.cpp:
Init counter when sending SCAN_TABREQ
sql/ha_ndbcluster.cc:
Make sure that blob don't have to big part size
exposed the attribute name size limit for handler
added field name truncation to ndb handler
mysql-test/t/ndb_basic.test:
test that attribute name truncation works
ndb/include/ndbapi/ndbapi_limits.h:
exposed the attribute name size limit for handler
sql/ha_ndbcluster.cc:
added field name truncation to ndb handler
removed compiler warning
ndb/src/ndbapi/NdbIndexOperation.cpp:
fix for alignment bug on solaris 64 bit
ndb/src/ndbapi/NdbOperationSearch.cpp:
fix for alignment bug on solaris 64 bit
sql/ha_ndbcluster.cc:
removed compiler warning
ndb/src/mgmsrv/ConfigInfo.cpp:
Better cast
ndb/src/mgmsrv/MgmtSrvr.cpp:
Add default arg
sql/ha_ndbcluster.cc:
reorder methods, so that they are not used prior to declaration
(inlines)
into mishka.local:/home/my/mysql-4.1
client/mysqlimport.c:
Auto merged
libmysql/libmysql.c:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
mysql-test/r/ndb_autodiscover.result:
Added test cases to check that SHOW TABLES only show tables in the selected db.
mysql-test/t/ndb_autodiscover.test:
Added test cases to check that SHOW TABLES only show tables in the selected db.
sql/ha_ndbcluster.cc:
Only find files for the current db
Only add files to files list which can be created i.e has a valid frm blob. This prevents NDB$BLOB tables and tables created from NdbApi to show up.
mysql-test/r/ndb_index_ordered.result:
Another test to check the use of "sorted" in combination with reset_bounds()
mysql-test/t/ndb_index_ordered.test:
Another test to check the use of "sorted" in combination with reset_bounds()
sql/ha_ndbcluster.cc:
Check that sorted is set to 0 or 1.
sql/opt_range.cc:
Initialise the sorted variable to zero QUICK_SELECT constructor.
sql/ha_ndbcluster.cc:
Only add the NDB-table to list of files if it can be discovered AND sucessfully created on disk. This will make susre that NDB$BLOB tables does not show up in SHOW TABLES
subqueries with "not in" and ndb
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
1) Fix handling of LQHKEYREF & IgnoreError & Index read
2) Fix TCRELEASEREQ = ok if CS_ABORTING & AS_IDLE
3) Give more info back in case of TCRELEASEREF
sql/ha_ndbcluster.cc:
Rewrite index_read to give proper error codes back
